[kernel] fix mini_fo on 2.6.26-rc4

[openwrt.git] / target / linux / ixp4xx / patches-2.6.23 / 400-dmabounce.patch

diff --git a/target/linux/ixp4xx/patches-2.6.23/400-dmabounce.patch b/target/linux/ixp4xx/patches-2.6.23/400-dmabounce.patch
index 481b443..cd7b058 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.23/400-dmabounce.patch
+++ b/target/linux/ixp4xx/patches-2.6.23/400-dmabounce.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23.14/arch/arm/common/dmabounce.c
+Index: linux-2.6.23.17/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.23.17.orig/arch/arm/common/dmabounce.c
++++ linux-2.6.23.17/arch/arm/common/dmabounce.c
+@@ -116,6 +116,10 @@ alloc_safe_buffer(struct dmabounce_devic

        } else if (size <= device_info->large.size) {
                pool = &device_info->large;
        } else {
        } else if (size <= device_info->large.size) {
                pool = &device_info->large;
        } else {


@@ -13,18 +13,18 @@ Index: linux-2.6.23.14/arch/arm/common/dmabounce.c
                pool = NULL;
        }
  
                pool = NULL;
        }
  

-Index: linux-2.6.23.14/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.23.17/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.23.17.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig
+@@ -220,6 +220,11 @@ config DMABOUNCE

        default y
        depends on PCI
  
 +config DMABOUNCE_DEBUG
 +      bool "Enable DMABounce debuging"
 +      default n
        default y
        depends on PCI
  
 +config DMABOUNCE_DEBUG
 +      bool "Enable DMABounce debuging"
 +      default n

-+      depends DMABOUNCE
++      depends on DMABOUNCE

 +
  config IXP4XX_INDIRECT_PCI
        bool "Use indirect PCI memory access"
 +
  config IXP4XX_INDIRECT_PCI
        bool "Use indirect PCI memory access"