aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-02 10:17:03 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-02 10:17:03 +0000
commitd7d8665572aea1b814c4a59d1b25d4a41c3baa62 (patch)
treee5ff9d6b5df84b7ab7808e1cfd9e0261db5bc4ce /target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
parentaaac1064de71c495d284b981d83f70d3bd445826 (diff)
downloadupstream-d7d8665572aea1b814c4a59d1b25d4a41c3baa62.tar.gz
upstream-d7d8665572aea1b814c4a59d1b25d4a41c3baa62.tar.bz2
upstream-d7d8665572aea1b814c4a59d1b25d4a41c3baa62.zip
update to 2.6.25.1 and refresh patches
SVN-Revision: 11006
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, 8 insertions, 8 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 f4910261e3..2b7cd76eb1 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,8 @@
-Index: linux-2.6.23.14/arch/arm/common/dmabounce.c
+Index: linux-2.6.25.1/arch/arm/common/dmabounce.c
===================================================================
---- linux-2.6.23.14.orig/arch/arm/common/dmabounce.c 2008-01-24 22:03:28.475500801 +0100
-+++ linux-2.6.23.14/arch/arm/common/dmabounce.c 2008-01-24 22:17:36.415822168 +0100
-@@ -116,6 +116,10 @@
+--- linux-2.6.25.1.orig/arch/arm/common/dmabounce.c
++++ linux-2.6.25.1/arch/arm/common/dmabounce.c
+@@ -117,6 +117,10 @@ alloc_safe_buffer(struct dmabounce_devic
} else if (size <= device_info->large.size) {
pool = &device_info->large;
} else {
@@ -13,11 +13,11 @@ Index: linux-2.6.23.14/arch/arm/common/dmabounce.c
pool = NULL;
}
-Index: linux-2.6.23.14/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
===================================================================
---- linux-2.6.23.14.orig/arch/arm/mach-ixp4xx/Kconfig 2008-01-24 22:10:29.331484012 +0100
-+++ linux-2.6.23.14/arch/arm/mach-ixp4xx/Kconfig 2008-01-24 22:11:42.891675973 +0100
-@@ -220,6 +220,11 @@
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+@@ -236,6 +236,11 @@ config DMABOUNCE
default y
depends on PCI