aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-06-11 08:44:50 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-06-11 08:44:50 +0000
commitf6825fb65997bc11928de3d08f352b366d5f4c25 (patch)
treed8362075ac8f8f8f3559c0d822a3d65e7fa28ae8 /target
parente1af68aaed2502926c7f358a725ea3e3751df1c7 (diff)
downloadupstream-f6825fb65997bc11928de3d08f352b366d5f4c25.tar.gz
upstream-f6825fb65997bc11928de3d08f352b366d5f4c25.tar.bz2
upstream-f6825fb65997bc11928de3d08f352b366d5f4c25.zip
Resync brcm47xx config with generic (#1856)
SVN-Revision: 7559
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm47xx-2.6/config/default17
1 files changed, 0 insertions, 17 deletions
diff --git a/target/linux/brcm47xx-2.6/config/default b/target/linux/brcm47xx-2.6/config/default
index 243ceb80da..b722f09102 100644
--- a/target/linux/brcm47xx-2.6/config/default
+++ b/target/linux/brcm47xx-2.6/config/default
@@ -89,16 +89,11 @@ CONFIG_GENERIC_GPIO=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HID=m
-# CONFIG_HID_DEBUG is not set
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
CONFIG_HZ=250
# CONFIG_HZ_100 is not set
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
CONFIG_HZ_250=y
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_48 is not set
# CONFIG_I2C is not set
# CONFIG_IDE is not set
# CONFIG_IKCONFIG is not set
@@ -218,16 +213,6 @@ CONFIG_MTD_PARTITIONS=y
CONFIG_NET_SCH_FIFO=y
# CONFIG_NET_SCH_NETEM is not set
# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_NAT_AMANDA is not set
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-CONFIG_NF_NAT_SIP=m
-# CONFIG_NF_NAT_TFTP is not set
# CONFIG_NTFS_FS is not set
# CONFIG_PAGE_SIZE_16KB is not set
CONFIG_PAGE_SIZE_4KB=y
@@ -305,5 +290,3 @@ CONFIG_USB_OHCI_HCD=m
CONFIG_USB_UHCI_HCD=m
# CONFIG_VIA_RHINE is not set
# CONFIG_WATCHDOG is not set
-CONFIG_ZONE_DMA=y
-CONFIG_ZONE_DMA_FLAG=1