powerpc/QE: move QE_GPIO Kconfig symbol into the platforms/Kconfig

Specifying user-selectable option in the qe_lib/Kconfig was a bad idea
because the qe_lib/Kconfig is included into the top level Kconfig, and
thus the QE_GPIO option appears at the top level menu.

This patch effectively moves the QE_GPIO option under the platform menu
instead.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 6cf517f5fba65e36b3628654e41908aeab42b5e0..47e956c871fe8cfc3aea613e5a1552771eccb9b4 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -249,6 +249,15 @@ config QUICC_ENGINE
          Selecting this option means that you wish to build a kernel
          for a machine with a QE coprocessor.
 
+config QE_GPIO
+       bool "QE GPIO support"
+       depends on QUICC_ENGINE
+       select GENERIC_GPIO
+       select ARCH_REQUIRE_GPIOLIB
+       help
+         Say Y here if you're going to use hardware that connects to the
+         QE GPIOs.
+
 config CPM2
        bool "Enable support for the CPM2 (Communications Processor Module)"
        depends on MPC85xx || 8260

diff --git a/arch/powerpc/sysdev/qe_lib/Kconfig b/arch/powerpc/sysdev/qe_lib/Kconfig
index 1ce546462be5af559539fb00314c8fc89d0c03b1..76ffbc48d4b949f410e611b15d6550a647bdb30b 100644 (file)
--- a/arch/powerpc/sysdev/qe_lib/Kconfig
+++ b/arch/powerpc/sysdev/qe_lib/Kconfig
@@ -24,12 +24,3 @@ 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 ARCH_REQUIRE_GPIOLIB
-       help
-         Say Y here if you're going to use hardware that connects to the
-         QE GPIOs.