diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-07-17 20:01:46 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-07-17 20:01:46 +0000 |
| commit | 8a674c3d5ea729e6557dcd6cd6a99a5ac9709110 (patch) | |
| tree | 0ef7ff24a0f09956c610d9e7bae33c4084694bb2 | |
| parent | 1818c218b9677f4b4e87b10e77184d42781856a5 (diff) | |
brcm47xx: activate swap again and run make oldconfig
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22266 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/brcm47xx/config-2.6.33 | 1 | ||||
| -rw-r--r-- | target/linux/brcm47xx/config-2.6.34 | 5 | ||||
| -rw-r--r-- | target/linux/brcm47xx/config-2.6.35 | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/config-2.6.33 b/target/linux/brcm47xx/config-2.6.33 index 4d86c5176b..677e8a6991 100644 --- a/target/linux/brcm47xx/config-2.6.33 +++ b/target/linux/brcm47xx/config-2.6.33 @@ -166,7 +166,6 @@ 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 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 diff --git a/target/linux/brcm47xx/config-2.6.35 b/target/linux/brcm47xx/config-2.6.35 index 4252d21be3..6e83fd4ca3 100644 --- a/target/linux/brcm47xx/config-2.6.35 +++ b/target/linux/brcm47xx/config-2.6.35 @@ -100,6 +100,7 @@ CONFIG_INITRAMFS_SOURCE="" CONFIG_IRQ_CPU=y CONFIG_KALLSYMS=y CONFIG_LEDS_GPIO=y +# CONFIG_LOONGSON_MC146818 is not set CONFIG_LOONGSON_UART_BASE=y # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set @@ -169,7 +170,6 @@ 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 |