fix a timeout on amd flash chips (patch from #874)

[openwrt.git] / target / linux / brcm-2.4 / config

diff --git a/target/linux/brcm-2.4/config b/target/linux/brcm-2.4/config
index b6120eb..7b00207 100644 (file)
--- a/target/linux/brcm-2.4/config
+++ b/target/linux/brcm-2.4/config
@@ -91,7 +91,6 @@ CONFIG_PCI=y
 CONFIG_NONCOHERENT_IO=y
 CONFIG_NEW_TIME_C=y
 CONFIG_NEW_IRQ=y
 CONFIG_NONCOHERENT_IO=y
 CONFIG_NEW_TIME_C=y
 CONFIG_NEW_IRQ=y

-CONFIG_HND=y

 # CONFIG_MIPS_AU1000 is not set
 
 #
 # CONFIG_MIPS_AU1000 is not set
 
 #


@@ -246,6 +245,7 @@ CONFIG_MTD_BCM947XX=y
 #
 # Self-contained MTD device drivers
 #
 #
 # Self-contained MTD device drivers
 #

+CONFIG_MTD_SFLASH=y

 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_MTDRAM is not set


@@ -353,7 +353,6 @@ CONFIG_IP_NF_CT_ACCT=m
 CONFIG_IP_NF_MATCH_CONNBYTES=m
 CONFIG_IP_NF_CT_PROTO_GRE=m
 CONFIG_IP_NF_PPTP=m
 CONFIG_IP_NF_MATCH_CONNBYTES=m
 CONFIG_IP_NF_CT_PROTO_GRE=m
 CONFIG_IP_NF_PPTP=m

-CONFIG_IP_NF_SIP=m

 CONFIG_IP_NF_H323=m
 CONFIG_IP_NF_MMS=m
 CONFIG_IP_NF_RTSP=m
 CONFIG_IP_NF_H323=m
 CONFIG_IP_NF_MMS=m
 CONFIG_IP_NF_RTSP=m


@@ -407,7 +406,6 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_NAT_PPTP=m
 CONFIG_IP_NF_NAT_PROTO_GRE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_NAT_PPTP=m
 CONFIG_IP_NF_NAT_PROTO_GRE=m

-CONFIG_IP_NF_NAT_SIP=m

 CONFIG_IP_NF_NAT_H323=m
 CONFIG_IP_NF_NAT_MMS=m
 CONFIG_IP_NF_NAT_RTSP=m
 CONFIG_IP_NF_NAT_H323=m
 CONFIG_IP_NF_NAT_MMS=m
 CONFIG_IP_NF_NAT_RTSP=m


@@ -727,7 +725,6 @@ CONFIG_SCSI_MULTI_LUN=y
 # Network device support
 #
 CONFIG_NETDEVICES=y
 # Network device support
 #
 CONFIG_NETDEVICES=y

-CONFIG_HND=y

 
 #
 # ARCnet devices
 
 #
 # ARCnet devices


@@ -812,7 +809,7 @@ CONFIG_B44=y
 # CONFIG_PLIP is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PLIP is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set

-# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_FILTER=y

 CONFIG_PPP_ASYNC=m
 # CONFIG_PPP_SYNC_TTY is not set
 CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_ASYNC=m
 # CONFIG_PPP_SYNC_TTY is not set
 CONFIG_PPP_DEFLATE=m


@@ -833,7 +830,6 @@ CONFIG_NET_RADIO=y
 # CONFIG_AIRONET4500_PROC is not set
 # CONFIG_AIRO is not set
 # CONFIG_HERMES is not set
 # CONFIG_AIRONET4500_PROC is not set
 # CONFIG_AIRO is not set
 # CONFIG_HERMES is not set

-CONFIG_WL=m

 # CONFIG_PLX_HERMES is not set
 # CONFIG_TMD_HERMES is not set
 # CONFIG_PCI_HERMES is not set
 # CONFIG_PLX_HERMES is not set
 # CONFIG_TMD_HERMES is not set
 # CONFIG_PCI_HERMES is not set


@@ -1383,7 +1379,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 #
 # Library routines
 #
 #
 # Library routines
 #

-# CONFIG_CRC32 is not set
+CONFIG_CRC32=y

 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 # CONFIG_FW_LOADER is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 # CONFIG_FW_LOADER is not set