[POWERPC] QE: automatically select QE options

Change the Kconfig files so that the Freescale QE options are automatically
selected if a QE device is selected.  Previously, you'd need to manually
select UCC_FAST if you want any "fast" UCC devices, such as Gigabit Ethernet.
Now, the QE Gigabit Ethernet option is always available if the device has a
QE, and UCC_FAST is automatically enabled.  A side-effect is that the
"QE Options" menu no longer exists.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

1 files changed, 2 insertions, 8 deletions

diff --git a/arch/powerpc/sysdev/qe_lib/Kconfig b/arch/powerpc/sysdev/qe_lib/Kconfig
index a725e80befa8..887739f3badc 100644
--- a/arch/powerpc/sysdev/qe_lib/Kconfig
+++ b/arch/powerpc/sysdev/qe_lib/Kconfig
@@ -2,11 +2,8 @@
 # QE Communication options
 #
 
-menu "QE Options"
-        depends on QUICC_ENGINE
-
 config UCC_SLOW
-        bool "UCC Slow Protocols Support"
+        bool
         default n
         select UCC
         help
@@ -14,10 +11,9 @@ config UCC_SLOW
           protocols: UART, BISYNC, QMC
 
 config UCC_FAST
-        bool "UCC Fast Protocols Support"
+        bool
         default n
         select UCC
-        select UCC_SLOW
         help
           This option provides qe_lib support to UCC fast
           protocols: HDLC, Ethernet, ATM, transparent
@@ -26,5 +22,3 @@ config UCC
         bool
         default y if UCC_FAST || UCC_SLOW
 
-endmenu
-