aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.36/402-ixp4xx_gpiolib.patch
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
commitce8e14c8f7aee407ac3aeaa401f02bec77e623af (patch)
treee54e486650c830dd690992e1f93e5757431aeb07 /target/linux/ixp4xx/patches-2.6.36/402-ixp4xx_gpiolib.patch
parentda6d6d54e95665f140464359dd70cc74656bc51c (diff)
downloadupstream-ce8e14c8f7aee407ac3aeaa401f02bec77e623af.tar.gz
upstream-ce8e14c8f7aee407ac3aeaa401f02bec77e623af.tar.bz2
upstream-ce8e14c8f7aee407ac3aeaa401f02bec77e623af.zip
[ixp4xx]: update the gpiolib patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23775 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.36/402-ixp4xx_gpiolib.patch')
-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 @@