aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2008-11-20 22:16:48 +0000
committerFlorian Fainelli <florian@openwrt.org>2008-11-20 22:16:48 +0000
commit8f5351a4f26ca89b09cceb49e0d2dd64a0f39e9b (patch)
treef3c222a03e34f80b1928d2f2930b5d4dec29c70b
parente854a26332784553a51aa31fa2d3b2884f8a75ae (diff)
downloadupstream-8f5351a4f26ca89b09cceb49e0d2dd64a0f39e9b.tar.gz
upstream-8f5351a4f26ca89b09cceb49e0d2dd64a0f39e9b.tar.bz2
upstream-8f5351a4f26ca89b09cceb49e0d2dd64a0f39e9b.zip
Synchroniz bcm63xx kernel configuration
SVN-Revision: 13300
-rw-r--r--target/linux/brcm63xx/config-2.6.275
1 files changed, 3 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27
index 2303047fb2..689ccf983a 100644
--- a/target/linux/brcm63xx/config-2.6.27
+++ b/target/linux/brcm63xx/config-2.6.27
@@ -8,7 +8,6 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_ARCH_SUPPORTS_OPROFILE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_FORE200E is not set
CONFIG_AUDIT=y
CONFIG_AUDIT_GENERIC=y
CONFIG_BASE_SMALL=0
@@ -84,6 +83,8 @@ CONFIG_EQUALIZER=m
# CONFIG_EXT3_FS_POSIX_ACL is not set
# CONFIG_EXT3_FS_SECURITY is not set
CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FIRMWARE_IN_KERNEL=y
# CONFIG_FIXED_PHY is not set
CONFIG_FS_MBCACHE=m
CONFIG_FS_POSIX_ACL=y
@@ -224,7 +225,6 @@ CONFIG_PCCARD=m
CONFIG_PCCARD_NONSTATIC=m
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
-# CONFIG_PCMCIA_BCM63XX is not set
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_PHYLIB=y
# CONFIG_PMC_MSP is not set
@@ -312,6 +312,7 @@ CONFIG_VIDEO_MEDIA=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L2_COMMON=m
CONFIG_VLAN_8021Q=m
+# CONFIG_VLAN_8021Q_GVRP is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_WAN_ROUTER=m
# CONFIG_WATCHDOG is not set