summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-01-29 14:39:56 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-01-29 14:39:56 +0000
commit05457f7a348f5707ca05ab9a4a7848d37784c0b2 (patch)
tree30c1e8d623bf2ec756b00ae74aac32bd8a0b7c89
parentcf68954004dfda5c4c49dcb79bda1753135b2a6c (diff)
make ixp4xx require gpiolib
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14262 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ixp4xx/config-2.6.281
-rw-r--r--target/linux/ixp4xx/patches-2.6.28/402-ixp4xx_gpiolib.patch12
2 files changed, 1 insertions, 12 deletions
diff --git a/target/linux/ixp4xx/config-2.6.28 b/target/linux/ixp4xx/config-2.6.28
index b22a3ccc5..374d1b159 100644
--- 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
diff --git a/target/linux/ixp4xx/patches-2.6.28/402-ixp4xx_gpiolib.patch b/target/linux/ixp4xx/patches-2.6.28/402-ixp4xx_gpiolib.patch
index f59e097cc..b9b73057f 100644
--- 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 @@