aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/config-2.6.34
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-07-17 20:01:46 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-07-17 20:01:46 +0000
commit20a234a7d77934255c2e172b67badcb43bc00ef6 (patch)
tree0ef7ff24a0f09956c610d9e7bae33c4084694bb2 /target/linux/brcm47xx/config-2.6.34
parenta6548c1c690b480e1efb55f33fe1885063e7d695 (diff)
downloadmaster-187ad058-20a234a7d77934255c2e172b67badcb43bc00ef6.tar.gz
master-187ad058-20a234a7d77934255c2e172b67badcb43bc00ef6.tar.bz2
master-187ad058-20a234a7d77934255c2e172b67badcb43bc00ef6.zip
brcm47xx: activate swap again and run make oldconfig
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22266 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/config-2.6.34')
-rw-r--r--target/linux/brcm47xx/config-2.6.345
1 files changed, 1 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/config-2.6.34 b/target/linux/brcm47xx/config-2.6.34
index 09fee33aa8..446cd7feae 100644
--- a/target/linux/brcm47xx/config-2.6.34
+++ b/target/linux/brcm47xx/config-2.6.34
@@ -98,9 +98,7 @@ CONFIG_IMAGE_CMDLINE_HACK=y
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_IP_ROUTE_VERBOSE is not set
CONFIG_IRQ_CPU=y
-# CONFIG_JFFS2_ZLIB is not set
CONFIG_KALLSYMS=y
-# CONFIG_KSZ884X_PCI is not set
CONFIG_LEDS_GPIO=y
CONFIG_LOONGSON_UART_BASE=y
# CONFIG_MACH_ALCHEMY is not set
@@ -159,6 +157,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SIBYTE_SWARM is not set
CONFIG_SSB=y
CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_BLOCKIO=y
CONFIG_SSB_DRIVER_EXTIF=y
CONFIG_SSB_DRIVER_GIGE=y
CONFIG_SSB_DRIVER_MIPS=y
@@ -170,14 +169,12 @@ CONFIG_SSB_PCIHOST=y
CONFIG_SSB_PCIHOST_POSSIBLE=y
CONFIG_SSB_SERIAL=y
CONFIG_SSB_SPROM=y
-# CONFIG_SWAP is not set
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
# CONFIG_TC35815 is not set
CONFIG_TRAD_SIGNALS=y
-# CONFIG_TREE_PREEMPT_RCU is not set
CONFIG_USB_SUPPORT=y
CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_ZONE_DMA_FLAG=0