Flatten brcm63xx patches, should make our life easier to patch files now ;)

[openwrt/openwrt.git] / target / linux / brcm63xx / config-2.6.27

diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27
index 72e4c4dd71b4e3b0bc83198d3e9ade4fc0fdc27f..ba3f1237e6e4c92f75921e238ea33a181b5cf3f5 100644 (file)
--- 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,8 +83,7 @@ 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 is not set
+CONFIG_FIRMWARE_IN_KERNEL=y
 # CONFIG_FIXED_PHY is not set
 CONFIG_FS_MBCACHE=m
 CONFIG_FS_POSIX_ACL=y
@@ -226,6 +224,8 @@ CONFIG_PCCARD=m
 CONFIG_PCCARD_NONSTATIC=m
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCMCIA=m
+# CONFIG_PCMCIA_BCM63XX is not set
 # CONFIG_PCSPKR_PLATFORM is not set
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
@@ -276,7 +276,18 @@ CONFIG_SERIO_SERPORT=m
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SQUASHFS_EMBEDDED=y
 CONFIG_SQUASHFS_VMALLOC=y
+CONFIG_SSB=m
+CONFIG_SSB_B43_PCI_BRIDGE=y
+# CONFIG_SSB_DRIVER_MIPS is not set
+# CONFIG_SSB_DRIVER_PCICORE is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
 CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB_SILENT is not set
+CONFIG_SSB_SPROM=y
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
@@ -292,8 +303,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_TCP_CONG_SCALABLE is not set
 CONFIG_TCP_CONG_VEGAS=m
 # CONFIG_TCP_CONG_VENO is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THERMAL_HWMON is not set
 CONFIG_TICK_ONESHOT=y
 CONFIG_TIPC=m
 # CONFIG_TIPC_ADVANCED is not set
@@ -313,7 +322,6 @@ 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