Merge branch 'linux-2.6' into for-2.6.22

[powerpc.git] / arch / powerpc / platforms / 85xx / Kconfig

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index e764c0a..329fcd4 100644 (file)
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -30,6 +30,12 @@ config MPC85xx_MDS
        help
          This option enables support for the MPC85xx MDS board
 
+config MPC8544_DS
+       bool "Freescale MPC8544 DS"
+       select DEFAULT_UIMAGE
+       help
+         This option enables support for the MPC8544 DS board
+
 endchoice
 
 config MPC8540
@@ -48,7 +54,8 @@ config MPC85xx
        select PPC_UDBG_16550
        select PPC_INDIRECT_PCI
        select SERIAL_8250_SHARE_IRQ if SERIAL_8250
-       default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS || MPC85xx_MDS
+       default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \
+               || MPC85xx_MDS || MPC8544_DS
 
 config PPC_INDIRECT_PCI_BE
        bool