aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-11-17 10:06:15 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-11-17 10:06:15 +0000
commit9be1b6cf8e78e53784efeac300d09188f6cef568 (patch)
treed588391d86cf897c3d8002a398a60bcadacf61ac /target/linux/ixp4xx
parent430b78b80dece21c3b868e94b6d86744f615a147 (diff)
downloadupstream-9be1b6cf8e78e53784efeac300d09188f6cef568.tar.gz
upstream-9be1b6cf8e78e53784efeac300d09188f6cef568.tar.bz2
upstream-9be1b6cf8e78e53784efeac300d09188f6cef568.zip
refresh 2.6.32 patches with -rc7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18440 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/patches-2.6.32/050-disable_dmabounce.patch2
-rw-r--r--target/linux/ixp4xx/patches-2.6.32/402-ixp4xx_gpiolib.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.32/050-disable_dmabounce.patch b/target/linux/ixp4xx/patches-2.6.32/050-disable_dmabounce.patch
index 9e1c023049..34de296b3d 100644
--- a/target/linux/ixp4xx/patches-2.6.32/050-disable_dmabounce.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/050-disable_dmabounce.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -415,7 +415,6 @@ config ARCH_IXP4XX
+@@ -418,7 +418,6 @@ config ARCH_IXP4XX
select GENERIC_GPIO
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
diff --git a/target/linux/ixp4xx/patches-2.6.32/402-ixp4xx_gpiolib.patch b/target/linux/ixp4xx/patches-2.6.32/402-ixp4xx_gpiolib.patch
index 6317034326..b3f1336f52 100644
--- a/target/linux/ixp4xx/patches-2.6.32/402-ixp4xx_gpiolib.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/402-ixp4xx_gpiolib.patch
@@ -50,7 +50,7 @@
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -415,6 +415,7 @@ config ARCH_IXP4XX
+@@ -418,6 +418,7 @@ config ARCH_IXP4XX
select GENERIC_GPIO
select GENERIC_TIME
select GENERIC_CLOCKEVENTS