Disable NFS_ACL support in the UML config, other platforms do not have it as well
[openwrt/svn-archive/archive.git] / target / linux / brcm-2.4 / patches / 004-flash.patch
1 Index: linux-2.4.35.4/drivers/mtd/devices/Config.in
2 ===================================================================
3 --- linux-2.4.35.4.orig/drivers/mtd/devices/Config.in
4 +++ linux-2.4.35.4/drivers/mtd/devices/Config.in
5 @@ -5,6 +5,7 @@
6 mainmenu_option next_comment
7
8 comment 'Self-contained MTD device drivers'
9 +bool ' Broadcom Chipcommon Serial Flash support' CONFIG_MTD_SFLASH
10 dep_tristate ' Ramix PMC551 PCI Mezzanine RAM card support' CONFIG_MTD_PMC551 $CONFIG_MTD $CONFIG_PCI
11 if [ "$CONFIG_MTD_PMC551" = "y" -o "$CONFIG_MTD_PMC551" = "m" ]; then
12 bool ' PMC551 256M DRAM Bugfix' CONFIG_MTD_PMC551_BUGFIX
13 Index: linux-2.4.35.4/drivers/mtd/devices/Makefile
14 ===================================================================
15 --- linux-2.4.35.4.orig/drivers/mtd/devices/Makefile
16 +++ linux-2.4.35.4/drivers/mtd/devices/Makefile
17 @@ -3,6 +3,8 @@
18 #
19 # $Id: Makefile,v 1.4 2001/06/26 21:10:05 spse Exp $
20
21 +EXTRA_CFLAGS := -I$(TOPDIR)/arch/mips/bcm947xx/include
22 +
23 O_TARGET := devlink.o
24
25 # *** BIG UGLY NOTE ***
26 @@ -12,6 +14,7 @@ O_TARGET := devlink.o
27 # here where previously there was none. We now have to ensure that
28 # doc200[01].o are linked before docprobe.o
29
30 +obj-$(CONFIG_MTD_SFLASH) += sflash.o
31 obj-$(CONFIG_MTD_DOC1000) += doc1000.o
32 obj-$(CONFIG_MTD_DOC2000) += doc2000.o
33 obj-$(CONFIG_MTD_DOC2001) += doc2001.o
34 Index: linux-2.4.35.4/drivers/mtd/maps/Config.in
35 ===================================================================
36 --- linux-2.4.35.4.orig/drivers/mtd/maps/Config.in
37 +++ linux-2.4.35.4/drivers/mtd/maps/Config.in
38 @@ -48,6 +48,7 @@ if [ "$CONFIG_PPC" = "y" ]; then
39 fi
40
41 if [ "$CONFIG_MIPS" = "y" ]; then
42 + dep_tristate ' CFI Flash device mapped on Broadcom BCM947XX boards' CONFIG_MTD_BCM947XX $CONFIG_MTD_CFI
43 dep_tristate ' Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
44 dep_tristate ' Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
45 dep_tristate ' Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
46 Index: linux-2.4.35.4/drivers/mtd/maps/Makefile
47 ===================================================================
48 --- linux-2.4.35.4.orig/drivers/mtd/maps/Makefile
49 +++ linux-2.4.35.4/drivers/mtd/maps/Makefile
50 @@ -3,6 +3,8 @@
51 #
52 # $Id: Makefile,v 1.37 2003/01/24 14:26:38 dwmw2 Exp $
53
54 +EXTRA_CFLAGS := -I$(TOPDIR)/arch/mips/bcm947xx/include
55 +
56 BELOW25 := $(shell echo $(PATCHLEVEL) | sed s/[1234]/y/)
57
58 ifeq ($(BELOW25),y)
59 @@ -10,6 +12,7 @@ O_TARGET := mapslink.o
60 endif
61
62 # Chip mappings
63 +obj-$(CONFIG_MTD_BCM947XX) += bcm947xx-flash.o
64 obj-$(CONFIG_MTD_CDB89712) += cdb89712.o
65 obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
66 obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o