Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6] / arch / powerpc / platforms / 85xx / Kconfig

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 0584f3c..e764c0a 100644 (file)
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -23,6 +23,13 @@ config MPC85xx_CDS
        help
          This option enables support for the MPC85xx CDS board
 
+config MPC85xx_MDS
+       bool "Freescale MPC85xx MDS"
+       select DEFAULT_UIMAGE
+#      select QUICC_ENGINE
+       help
+         This option enables support for the MPC85xx MDS board
+
 endchoice
 
 config MPC8540
@@ -36,6 +43,13 @@ config MPC8560
        select PPC_INDIRECT_PCI
        default y if MPC8560_ADS
 
+config MPC85xx
+       bool
+       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
+
 config PPC_INDIRECT_PCI_BE
        bool
        depends on PPC_85xx