aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-07-12 11:31:00 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-07-12 11:31:00 +0000
commit349d57eee43a663f314ac79f8b0e799224bb05a3 (patch)
tree021fea8bf8be6ff7abe8649fdfcc6fe2dfc9ab7b
parent365635b7f367c9af0901e1d25ddfea38c48fd6f1 (diff)
downloadupstream-349d57eee43a663f314ac79f8b0e799224bb05a3.tar.gz
upstream-349d57eee43a663f314ac79f8b0e799224bb05a3.tar.bz2
upstream-349d57eee43a663f314ac79f8b0e799224bb05a3.zip
resync kernel configuration and enable kexec
SVN-Revision: 16795
-rw-r--r--target/linux/brcm63xx/config-2.6.274
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27
index 51d0630980..387df15f71 100644
--- a/target/linux/brcm63xx/config-2.6.27
+++ b/target/linux/brcm63xx/config-2.6.27
@@ -61,8 +61,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_VR41XX is not set
CONFIG_CRAMFS=y
CONFIG_CSRC_R4K=y
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -108,6 +106,7 @@ CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
CONFIG_IRQ_CPU=y
# CONFIG_ISDN is not set
+CONFIG_KEXEC=y
CONFIG_LBD=y
# CONFIG_LEDS_GPIO is not set
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
@@ -122,6 +121,7 @@ CONFIG_MAGIC_SYSRQ=y
# CONFIG_MIKROTIK_RB532 is not set
CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
+# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
# CONFIG_MIPS_MACHINE is not set
# CONFIG_MIPS_MALTA is not set