aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches/007-samsung_flash.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-05-26 19:41:42 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-05-26 19:41:42 +0000
commit94c0d84182f1ca41f280b43d4f52fe6346153c48 (patch)
tree324b8afd607b0c63c5746d58b66ce75647153e8d /target/linux/generic-2.6/patches/007-samsung_flash.patch
parentd4cce8a452b1f1457b19b356245d1b91eb3357e8 (diff)
downloadupstream-94c0d84182f1ca41f280b43d4f52fe6346153c48.tar.gz
upstream-94c0d84182f1ca41f280b43d4f52fe6346153c48.tar.bz2
upstream-94c0d84182f1ca41f280b43d4f52fe6346153c48.zip
refresh kernel patches so that they apply cleanly
SVN-Revision: 7347
Diffstat (limited to 'target/linux/generic-2.6/patches/007-samsung_flash.patch')
-rw-r--r--target/linux/generic-2.6/patches/007-samsung_flash.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic-2.6/patches/007-samsung_flash.patch b/target/linux/generic-2.6/patches/007-samsung_flash.patch
index e48fe04b0d..8c94003081 100644
--- a/target/linux/generic-2.6/patches/007-samsung_flash.patch
+++ b/target/linux/generic-2.6/patches/007-samsung_flash.patch
@@ -1,15 +1,15 @@
-diff -urN linux-2.6.19.old/drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.19.dev/drivers/mtd/chips/cfi_cmdset_0002.c
---- linux-2.6.19.old/drivers/mtd/chips/cfi_cmdset_0002.c 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.dev/drivers/mtd/chips/cfi_cmdset_0002.c 2006-12-14 03:13:30.000000000 +0100
-@@ -50,6 +50,7 @@
- #define SST49LF004B 0x0060
+diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0002.c
+--- linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c 2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0002.c 2007-05-26 19:30:01.049193968 +0200
+@@ -51,6 +51,7 @@
+ #define SST49LF040B 0x0050
#define SST49LF008A 0x005a
#define AT49BV6416 0x00d6
+#define MANUFACTURER_SAMSUNG 0x00ec
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -293,12 +294,19 @@
+@@ -294,12 +295,19 @@
if (extp->MajorVersion != '1' ||
(extp->MinorVersion < '0' || extp->MinorVersion > '4')) {