summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm-2.4/patches/004-flash.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-05-19 13:45:06 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-05-19 13:45:06 +0000
commit5591c1326704b8edd79421b32344b0c7121981ec (patch)
tree9e60d8f9ecca2db62c5d03e4ff11c5f3e05346f2 /target/linux/brcm-2.4/patches/004-flash.patch
parentf3016ce71f0bbc04af06b7f8be4a4af0fd0269c2 (diff)
[brcm-2.4] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11214 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm-2.4/patches/004-flash.patch')
-rw-r--r--target/linux/brcm-2.4/patches/004-flash.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/brcm-2.4/patches/004-flash.patch b/target/linux/brcm-2.4/patches/004-flash.patch
index 0046c37e7..8f75b65fe 100644
--- a/target/linux/brcm-2.4/patches/004-flash.patch
+++ b/target/linux/brcm-2.4/patches/004-flash.patch
@@ -1,7 +1,7 @@
Index: linux-2.4.35.4/drivers/mtd/devices/Config.in
===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/devices/Config.in 2007-12-15 05:19:36.210484556 +0100
-+++ linux-2.4.35.4/drivers/mtd/devices/Config.in 2007-12-15 05:20:14.656675480 +0100
+--- linux-2.4.35.4.orig/drivers/mtd/devices/Config.in
++++ linux-2.4.35.4/drivers/mtd/devices/Config.in
@@ -5,6 +5,7 @@
mainmenu_option next_comment
@@ -12,8 +12,8 @@ Index: linux-2.4.35.4/drivers/mtd/devices/Config.in
bool ' PMC551 256M DRAM Bugfix' CONFIG_MTD_PMC551_BUGFIX
Index: linux-2.4.35.4/drivers/mtd/devices/Makefile
===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/devices/Makefile 2007-12-15 05:19:36.218485012 +0100
-+++ linux-2.4.35.4/drivers/mtd/devices/Makefile 2007-12-15 05:20:14.660675705 +0100
+--- linux-2.4.35.4.orig/drivers/mtd/devices/Makefile
++++ linux-2.4.35.4/drivers/mtd/devices/Makefile
@@ -3,6 +3,8 @@
#
# $Id: Makefile,v 1.4 2001/06/26 21:10:05 spse Exp $
@@ -23,7 +23,7 @@ Index: linux-2.4.35.4/drivers/mtd/devices/Makefile
O_TARGET := devlink.o
# *** BIG UGLY NOTE ***
-@@ -12,6 +14,7 @@
+@@ -12,6 +14,7 @@ O_TARGET := devlink.o
# here where previously there was none. We now have to ensure that
# doc200[01].o are linked before docprobe.o
@@ -33,9 +33,9 @@ Index: linux-2.4.35.4/drivers/mtd/devices/Makefile
obj-$(CONFIG_MTD_DOC2001) += doc2001.o
Index: linux-2.4.35.4/drivers/mtd/maps/Config.in
===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/maps/Config.in 2007-12-15 05:19:44.950982647 +0100
-+++ linux-2.4.35.4/drivers/mtd/maps/Config.in 2007-12-15 05:20:14.664675934 +0100
-@@ -48,6 +48,7 @@
+--- linux-2.4.35.4.orig/drivers/mtd/maps/Config.in
++++ linux-2.4.35.4/drivers/mtd/maps/Config.in
+@@ -48,6 +48,7 @@ if [ "$CONFIG_PPC" = "y" ]; then
fi
if [ "$CONFIG_MIPS" = "y" ]; then
@@ -45,8 +45,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/Config.in
dep_tristate ' Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
Index: linux-2.4.35.4/drivers/mtd/maps/Makefile
===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/maps/Makefile 2007-12-15 05:19:44.954982876 +0100
-+++ linux-2.4.35.4/drivers/mtd/maps/Makefile 2007-12-15 05:20:14.664675934 +0100
+--- linux-2.4.35.4.orig/drivers/mtd/maps/Makefile
++++ linux-2.4.35.4/drivers/mtd/maps/Makefile
@@ -3,6 +3,8 @@
#
# $Id: Makefile,v 1.37 2003/01/24 14:26:38 dwmw2 Exp $
@@ -56,7 +56,7 @@ Index: linux-2.4.35.4/drivers/mtd/maps/Makefile
BELOW25 := $(shell echo $(PATCHLEVEL) | sed s/[1234]/y/)
ifeq ($(BELOW25),y)
-@@ -10,6 +12,7 @@
+@@ -10,6 +12,7 @@ O_TARGET := mapslink.o
endif
# Chip mappings