aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2010-11-02 12:20:58 +0000
committerImre Kaloz <kaloz@openwrt.org>2010-11-02 12:20:58 +0000
commitd50ec0371001b81c5efacab6729b7cb0533d8adf (patch)
treef668356e3057866ca011c761d2b3a21748c08c95 /target
parent3b1eb0f07c3e4801ebb2c6519dce6a88bbb46a94 (diff)
downloadupstream-d50ec0371001b81c5efacab6729b7cb0533d8adf.tar.gz
upstream-d50ec0371001b81c5efacab6729b7cb0533d8adf.tar.bz2
upstream-d50ec0371001b81c5efacab6729b7cb0533d8adf.zip
update the gpiolib patch
SVN-Revision: 23775
Diffstat (limited to 'target')
-rw-r--r--target/linux/ixp4xx/patches-2.6.36/402-ixp4xx_gpiolib.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.36/402-ixp4xx_gpiolib.patch b/target/linux/ixp4xx/patches-2.6.36/402-ixp4xx_gpiolib.patch
index 5225507137..f8e9df544e 100644
--- a/target/linux/ixp4xx/patches-2.6.36/402-ixp4xx_gpiolib.patch
+++ b/target/linux/ixp4xx/patches-2.6.36/402-ixp4xx_gpiolib.patch
@@ -61,14 +61,15 @@
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -435,6 +435,7 @@ config ARCH_IXP4XX
+@@ -431,7 +431,7 @@ config ARCH_IXP4XX
+ bool "IXP4xx-based"
+ depends on MMU
select CPU_XSCALE
- select GENERIC_GPIO
- select GENERIC_CLOCKEVENTS
+- select GENERIC_GPIO
+ select ARCH_REQUIRE_GPIOLIB
+ select GENERIC_CLOCKEVENTS
+ select DMABOUNCE if PCI
help
- Support for Intel's IXP4XX (XScale) family of processors.
-
--- a/arch/arm/mach-ixp4xx/include/mach/gpio.h
+++ b/arch/arm/mach-ixp4xx/include/mach/gpio.h
@@ -27,47 +27,31 @@