Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...

[pandora-kernel.git] / arch / powerpc / sysdev / qe_lib / Kconfig

diff --git a/arch/powerpc/sysdev/qe_lib/Kconfig b/arch/powerpc/sysdev/qe_lib/Kconfig
index a725e80..4bb18f5 100644 (file)
--- a/arch/powerpc/sysdev/qe_lib/Kconfig
+++ b/arch/powerpc/sysdev/qe_lib/Kconfig
@@ -2,22 +2,16 @@
 # QE Communication options
 #
 
-menu "QE Options"
-       depends on QUICC_ENGINE
-
 config UCC_SLOW
-       bool "UCC Slow Protocols Support"
-       default n
-       select UCC
+       bool
+       default y if SERIAL_QE
        help
          This option provides qe_lib support to UCC slow
          protocols: UART, BISYNC, QMC
 
 config UCC_FAST
-       bool "UCC Fast Protocols Support"
-       default n
-       select UCC
-       select UCC_SLOW
+       bool
+       default y if UCC_GETH
        help
          This option provides qe_lib support to UCC fast
          protocols: HDLC, Ethernet, ATM, transparent
@@ -26,5 +20,16 @@ config UCC
        bool
        default y if UCC_FAST || UCC_SLOW
 
-endmenu
+config QE_USB
+       bool
+       help
+         QE USB Host Controller support
 
+config QE_GPIO
+       bool "QE GPIO support"
+       depends on QUICC_ENGINE
+       select GENERIC_GPIO
+       select HAVE_GPIO_LIB
+       help
+         Say Y here if you're going to use hardware that connects to the
+         QE GPIOs.