diff options
| author | John Crispin <blogic@openwrt.org> | 2008-05-08 07:18:51 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2008-05-08 07:18:51 +0000 |
| commit | 5ed5df3c4563a687ecfa9e0ece7690b86d6f428b (patch) | |
| tree | 5f425cfee1e640f54b9c76b422f30477c157da49 /target/linux/ifxmips/patches/160-cfi-swap.patch | |
| parent | d62655369cb395f2bd18d23eb2b95d1e91da0fa5 (diff) | |
| download | master-187ad058-5ed5df3c4563a687ecfa9e0ece7690b86d6f428b.tar.gz master-187ad058-5ed5df3c4563a687ecfa9e0ece7690b86d6f428b.tar.bz2 master-187ad058-5ed5df3c4563a687ecfa9e0ece7690b86d6f428b.zip | |
bump ifxmips to 2.6.25.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11071 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ifxmips/patches/160-cfi-swap.patch')
| -rw-r--r-- | target/linux/ifxmips/patches/160-cfi-swap.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/target/linux/ifxmips/patches/160-cfi-swap.patch b/target/linux/ifxmips/patches/160-cfi-swap.patch index 116503f65d..6ddfc7e233 100644 --- a/target/linux/ifxmips/patches/160-cfi-swap.patch +++ b/target/linux/ifxmips/patches/160-cfi-swap.patch @@ -1,15 +1,16 @@ -Index: linux-2.6.23/drivers/mtd/chips/cfi_cmdset_0002.c +Index: linux-2.6.25/drivers/mtd/chips/cfi_cmdset_0002.c =================================================================== ---- linux-2.6.23.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2007-11-02 23:02:29.000000000 +0100 -+++ linux-2.6.23/drivers/mtd/chips/cfi_cmdset_0002.c 2007-11-02 23:07:15.000000000 +0100 -@@ -1007,7 +1007,9 @@ - int ret = 0; - map_word oldd; +--- linux-2.6.25.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2008-05-07 18:58:41.000000000 +0100 ++++ linux-2.6.25/drivers/mtd/chips/cfi_cmdset_0002.c 2008-05-07 18:58:42.000000000 +0100 +@@ -1015,7 +1015,9 @@ int retry_cnt = 0; + + adr += chip->start; - +#ifdef CONFIG_IFXMIPS + adr ^= 2; +#endif - adr += chip->start; - spin_lock(chip->mutex); + ret = get_chip(map, chip, adr, FL_WRITING); + if (ret) { + |