[kernel] fix nf_conntrack_rtsp compile error on 2.6.26 (closes #3797)

[openwrt-10.03/.git] / target / linux / etrax / patches / 200-samsung_flash.patch

diff --git a/target/linux/etrax/patches/200-samsung_flash.patch b/target/linux/etrax/patches/200-samsung_flash.patch
index 7b5e65e465a0d6ab9f4a2b81a9ecbabed80373c5..ac4ac67818e44879ae57f53b00d79d8b1cd5c576 100644 (file)
--- a/target/linux/etrax/patches/200-samsung_flash.patch
+++ b/target/linux/etrax/patches/200-samsung_flash.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0002.c
-===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/chips/cfi_cmdset_0002.c    2008-05-03 20:09:19.000000000 +0100
-+++ linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0002.c 2008-05-03 20:10:57.000000000 +0100
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
 @@ -297,8 +297,8 @@
                        return NULL;
                }