Bläddra i källkod

gpio: drop surplus PCI and USB dependencies

The PCI/USB expander menus already depend on PCI/USB, drop subdependecies
on individual drivers.

Signed-off-by: Andrew F. Davis <afd@ti.com>
[Rebased to the GPIO tree]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Andrew F. Davis 9 år sedan
förälder
incheckning
0374452968
1 ändrade filer med 5 tillägg och 8 borttagningar
  1. 5 8
      drivers/gpio/Kconfig

+ 5 - 8
drivers/gpio/Kconfig

@@ -920,7 +920,6 @@ menu "PCI GPIO expanders"
 
 
 config GPIO_AMD8111
 config GPIO_AMD8111
 	tristate "AMD 8111 GPIO driver"
 	tristate "AMD 8111 GPIO driver"
-	depends on PCI
 	help
 	help
 	  The AMD 8111 south bridge contains 32 GPIO pins which can be used.
 	  The AMD 8111 south bridge contains 32 GPIO pins which can be used.
 
 
@@ -932,7 +931,7 @@ config GPIO_AMD8111
 
 
 config GPIO_BT8XX
 config GPIO_BT8XX
 	tristate "BT8XX GPIO abuser"
 	tristate "BT8XX GPIO abuser"
-	depends on PCI && VIDEO_BT848=n
+	depends on VIDEO_BT848=n
 	help
 	help
 	  The BT8xx frame grabber chip has 24 GPIO pins that can be abused
 	  The BT8xx frame grabber chip has 24 GPIO pins that can be abused
 	  as a cheap PCI GPIO card.
 	  as a cheap PCI GPIO card.
@@ -948,14 +947,13 @@ config GPIO_BT8XX
 
 
 config GPIO_INTEL_MID
 config GPIO_INTEL_MID
 	bool "Intel Mid GPIO support"
 	bool "Intel Mid GPIO support"
-	depends on PCI && X86
+	depends on X86
 	select GPIOLIB_IRQCHIP
 	select GPIOLIB_IRQCHIP
 	help
 	help
 	  Say Y here to support Intel Mid GPIO.
 	  Say Y here to support Intel Mid GPIO.
 
 
 config GPIO_ML_IOH
 config GPIO_ML_IOH
 	tristate "OKI SEMICONDUCTOR ML7213 IOH GPIO support"
 	tristate "OKI SEMICONDUCTOR ML7213 IOH GPIO support"
-	depends on PCI
 	select GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_CHIP
 	help
 	help
 	  ML7213 is companion chip for Intel Atom E6xx series.
 	  ML7213 is companion chip for Intel Atom E6xx series.
@@ -965,7 +963,7 @@ config GPIO_ML_IOH
 
 
 config GPIO_PCH
 config GPIO_PCH
 	tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7223/ML7831) GPIO"
 	tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7223/ML7831) GPIO"
-	depends on PCI && (X86_32 || MIPS || COMPILE_TEST)
+	depends on X86_32 || MIPS || COMPILE_TEST
 	select GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_CHIP
 	help
 	help
 	  This driver is for PCH(Platform controller Hub) GPIO of Intel Topcliff
 	  This driver is for PCH(Platform controller Hub) GPIO of Intel Topcliff
@@ -981,7 +979,6 @@ config GPIO_PCH
 
 
 config GPIO_RDC321X
 config GPIO_RDC321X
 	tristate "RDC R-321x GPIO support"
 	tristate "RDC R-321x GPIO support"
-	depends on PCI
 	select MFD_CORE
 	select MFD_CORE
 	select MFD_RDC321X
 	select MFD_RDC321X
 	help
 	help
@@ -990,7 +987,7 @@ config GPIO_RDC321X
 
 
 config GPIO_SODAVILLE
 config GPIO_SODAVILLE
 	bool "Intel Sodaville GPIO support"
 	bool "Intel Sodaville GPIO support"
-	depends on X86 && PCI && OF
+	depends on X86 && OF
 	select GPIO_GENERIC
 	select GPIO_GENERIC
 	select GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_CHIP
 	help
 	help
@@ -1041,7 +1038,7 @@ menu "USB GPIO expanders"
 
 
 config GPIO_VIPERBOARD
 config GPIO_VIPERBOARD
 	tristate "Viperboard GPIO a & b support"
 	tristate "Viperboard GPIO a & b support"
-	depends on MFD_VIPERBOARD && USB
+	depends on MFD_VIPERBOARD
 	help
 	help
 	  Say yes here to access the GPIO signals of Nano River
 	  Say yes here to access the GPIO signals of Nano River
 	  Technologies Viperboard. There are two GPIO chips on the
 	  Technologies Viperboard. There are two GPIO chips on the