merge netfilter kernel changes to 2.6.26 as well

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.24 / 007-samsung_flash.patch

diff --git a/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch
index 9685a7b..1d679e0 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0002.c
-===================================================================
---- linux-2.6.24.7.orig/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0002.c
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
 @@ -51,6 +51,7 @@
  #define SST49LF040B           0x0050
  #define SST49LF008A           0x005a