make ixp4xx require gpiolib

SVN-Revision: 14262
2009-01-29 14:39:56 +00:00 · 2009-01-29 14:39:56 +00:00 · d269d51004
parent 1a680734c2
commit d269d51004
2 changed files with 1 additions and 12 deletions
--- a/target/linux/ixp4xx/config-2.6.28
+++ b/target/linux/ixp4xx/config-2.6.28
@ -125,7 +125,6 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
 # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
 CONFIG_HAVE_FTRACE=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_GPIO_LIB=y
 CONFIG_HAVE_IDE=y
 # CONFIG_HAVE_IOREMAP_PROT is not set
 CONFIG_HAVE_KPROBES=y
--- a/target/linux/ixp4xx/patches-2.6.28/402-ixp4xx_gpiolib.patch
+++ b/target/linux/ixp4xx/patches-2.6.28/402-ixp4xx_gpiolib.patch
@ -54,20 +54,10 @@
 	select GENERIC_GPIO
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
-+	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select ARCH_REQUIRE_GPIOLIB
 	select DMABOUNCE if PCI
 	help
 	  Support for Intel's IXP4XX (XScale) family of processors.
--- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -28,6 +28,7 @@ config MACH_AVILA
- config MACH_CAMBRIA
- 	bool "Cambria"
- 	select PCI
-+	select GPIOLIB
- 	help
- 	  Say 'Y' here if you want your kernel to support the Gateworks
- 	  Cambria series. For more information on this platform,
 --- a/arch/arm/mach-ixp4xx/include/mach/gpio.h
 +++ b/arch/arm/mach-ixp4xx/include/mach/gpio.h
@@ -27,47 +27,31 @@