summaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-30 16:32:35 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-30 16:32:35 +0000
commit9285574b20298c1499aedee162f5659e1e356862 (patch)
treed5f50bfbd765bba8d95d15fa170f7d487a7d1d49 /target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
parentf664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce (diff)
downloadmaster-31e0f0ae-9285574b20298c1499aedee162f5659e1e356862.tar.gz
master-31e0f0ae-9285574b20298c1499aedee162f5659e1e356862.tar.bz2
master-31e0f0ae-9285574b20298c1499aedee162f5659e1e356862.zip
refresh ixp4xx patches to match upstream style
SVN-Revision: 11297
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch16
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch b/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
index 9831cd515b..7dae291497 100644
--- a/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/arch/arm/common/dmabounce.c
-===================================================================
---- linux-2.6.25.4.orig/arch/arm/common/dmabounce.c
-+++ linux-2.6.25.4/arch/arm/common/dmabounce.c
-@@ -117,6 +117,10 @@ alloc_safe_buffer(struct dmabounce_devic
+--- a/arch/arm/common/dmabounce.c
++++ b/arch/arm/common/dmabounce.c
+@@ -117,6 +117,10 @@
} else if (size <= device_info->large.size) {
pool = &device_info->large;
} else {
@@ -13,11 +11,9 @@ Index: linux-2.6.25.4/arch/arm/common/dmabounce.c
pool = NULL;
}
-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
-@@ -236,6 +236,11 @@ config DMABOUNCE
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
+@@ -236,6 +236,11 @@
default y
depends on PCI