Merge branch 'linux-2.6' into for-2.6.22

[pandora-kernel.git] / arch / powerpc / platforms / 83xx / Kconfig

diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 1aea1e6..2a23392 100644 (file)
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -18,6 +18,13 @@ config MPC832x_MDS
        help
          This option enables support for the MPC832x MDS evaluation board.
 
+config MPC832x_RDB
+       bool "Freescale MPC832x RDB"
+       select DEFAULT_UIMAGE
+       select QUICC_ENGINE
+       help
+         This option enables support for the MPC8323 RDB board.
+
 config MPC834x_MDS
        bool "Freescale MPC834x MDS"
        select DEFAULT_UIMAGE
@@ -38,12 +45,12 @@ config MPC834x_ITX
          Be aware that PCI initialization is the bootloader's
          responsibility.
 
-config MPC8360E_PB
-       bool "Freescale MPC8360E PB"
+config MPC836x_MDS
+       bool "Freescale MPC836x MDS"
        select DEFAULT_UIMAGE
        select QUICC_ENGINE
        help
-         This option enables support for the MPC836x EMDS Processor Board.
+         This option enables support for the MPC836x MDS Processor Board.
 
 endchoice
 
@@ -57,7 +64,7 @@ config PPC_MPC832x
        bool
        select PPC_UDBG_16550
        select PPC_INDIRECT_PCI
-       default y if MPC832x_MDS
+       default y if MPC832x_MDS || MPC832x_RDB
 
 config MPC834x
        bool
@@ -69,6 +76,6 @@ config PPC_MPC836x
        bool
        select PPC_UDBG_16550
        select PPC_INDIRECT_PCI
-       default y if MPC8360E_PB
+       default y if MPC836x_MDS
 
 endmenu