Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

[karo-tx-linux.git] / arch / powerpc / platforms / 40x / Kconfig

diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index a392d12dd21f89a935ff93499c21d71891d868b0..6e287f1294fa3837a714d50816d3068527c94a9d 100644 (file)
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -20,7 +20,6 @@ config HOTFOOT
         bool "Hotfoot"
        depends on 40x
        default n
-       select 405EP
        select PPC40x_SIMPLE
        select PCI
         help
@@ -105,9 +104,6 @@ config 405GP
        select IBM405_ERR51
        select IBM_EMAC_ZMII
 
-config 405EP
-       bool
-
 config 405EX
        bool
        select IBM_EMAC_EMAC4
@@ -119,9 +115,6 @@ config 405EZ
        select IBM_EMAC_MAL_CLR_ICINTSTAT
        select IBM_EMAC_MAL_COMMON_ERR
 
-config 405GPR
-       bool
-
 config XILINX_VIRTEX
        bool
        select DEFAULT_UIMAGE
@@ -145,7 +138,6 @@ config PPC4xx_GPIO
        bool "PPC4xx GPIO support"
        depends on 40x
        select ARCH_REQUIRE_GPIOLIB
-       select GENERIC_GPIO
        help
          Enable gpiolib support for ppc40x based boards