diff options
author | Felix Fietkau <nbd@openwrt.org> | 2008-01-06 19:28:07 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2008-01-06 19:28:07 +0000 |
commit | 19887d557e01aad2145fa3ad086bc12a8d04695a (patch) | |
tree | 58af9e3b3204308a2b7853127331f4d693e1b744 /target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch | |
parent | 666f303b8f8a76ca44b62a58ae270d520944897b (diff) | |
download | master-187ad058-19887d557e01aad2145fa3ad086bc12a8d04695a.tar.gz master-187ad058-19887d557e01aad2145fa3ad086bc12a8d04695a.tar.bz2 master-187ad058-19887d557e01aad2145fa3ad086bc12a8d04695a.zip |
update brcm-2.4 to 2.4.35.4, integrate new broadcom system code, update broadcom-wl to a contributed version (v4.150.10.5) - no bcm57xx support yet, will follow shortly
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10137 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch')
-rw-r--r-- | target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch b/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch index b2397f6249..6663202a1f 100644 --- a/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch +++ b/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch @@ -1,6 +1,7 @@ -diff -urN linux.old/drivers/mtd/chips/cfi_cmdset_0001.c linux.dev/drivers/mtd/chips/cfi_cmdset_0001.c ---- linux.old/drivers/mtd/chips/cfi_cmdset_0001.c 2004-11-17 12:54:21.000000000 +0100 -+++ linux.dev/drivers/mtd/chips/cfi_cmdset_0001.c 2006-03-16 17:25:04.000000000 +0100 +Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c +=================================================================== +--- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_cmdset_0001.c 2007-12-15 05:19:42.414838122 +0100 ++++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c 2007-12-15 05:19:50.315288342 +0100 @@ -28,10 +28,18 @@ #include <linux/slab.h> #include <linux/delay.h> @@ -38,7 +39,7 @@ diff -urN linux.old/drivers/mtd/chips/cfi_cmdset_0001.c linux.dev/drivers/mtd/ch return mtd; setup_err: -@@ -1960,10 +1972,40 @@ +@@ -1961,10 +1973,40 @@ } } @@ -79,9 +80,10 @@ diff -urN linux.old/drivers/mtd/chips/cfi_cmdset_0001.c linux.dev/drivers/mtd/ch kfree(cfi->cmdset_priv); kfree(cfi->cfiq); kfree(cfi); -diff -urN linux.old/include/linux/mtd/mtd.h linux.dev/include/linux/mtd/mtd.h ---- linux.old/include/linux/mtd/mtd.h 2003-08-25 13:44:44.000000000 +0200 -+++ linux.dev/include/linux/mtd/mtd.h 2006-03-16 17:00:10.000000000 +0100 +Index: linux-2.4.35.4/include/linux/mtd/mtd.h +=================================================================== +--- linux-2.4.35.4.orig/include/linux/mtd/mtd.h 2007-12-15 05:19:42.422838578 +0100 ++++ linux-2.4.35.4/include/linux/mtd/mtd.h 2007-12-15 05:19:50.315288342 +0100 @@ -10,6 +10,7 @@ #include <linux/version.h> #include <linux/types.h> |