Merge branch 'linus' into core/urgent

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 83xx / Kconfig

diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 6159c5d4e5f1335d2fd3e7f44dbe887885dab183..83c664afc897c76023d65e7e4b231e9fa26c0310 100644 (file)
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -19,7 +19,6 @@ config MPC831x_RDB
 config MPC832x_MDS
        bool "Freescale MPC832x MDS"
        select DEFAULT_UIMAGE
-       select QUICC_ENGINE
        select PPC_MPC832x
        help
          This option enables support for the MPC832x MDS evaluation board.
@@ -27,7 +26,6 @@ config MPC832x_MDS
 config MPC832x_RDB
        bool "Freescale MPC832x RDB"
        select DEFAULT_UIMAGE
-       select QUICC_ENGINE
        select PPC_MPC832x
        help
          This option enables support for the MPC8323 RDB board.
@@ -57,15 +55,12 @@ config MPC834x_ITX
 config MPC836x_MDS
        bool "Freescale MPC836x MDS"
        select DEFAULT_UIMAGE
-       select QUICC_ENGINE
        help
          This option enables support for the MPC836x MDS Processor Board.
 
 config MPC836x_RDK
        bool "Freescale/Logic MPC836x RDK"
        select DEFAULT_UIMAGE
-       select QUICC_ENGINE
-       select QE_GPIO
        select FSL_GTM
        select FSL_LBC
        help