linux/generic: sync to todays yaffs tree

[openwrt.git] / target / linux / generic / config-2.6.30

diff --git a/target/linux/generic/config-2.6.30 b/target/linux/generic/config-2.6.30
index b2ced18..b2b7b21 100644 (file)
--- a/target/linux/generic/config-2.6.30
+++ b/target/linux/generic/config-2.6.30
@@ -620,6 +620,7 @@ CONFIG_FUTEX=y
 CONFIG_FW_LOADER=y
 CONFIG_GACT_PROB=y
 # CONFIG_GAMEPORT is not set
 CONFIG_FW_LOADER=y
 CONFIG_GACT_PROB=y
 # CONFIG_GAMEPORT is not set

+# CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE is not set

 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HWEIGHT=y


@@ -1054,6 +1055,7 @@ CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_STATISTICS is not set
 # CONFIG_JME is not set
 CONFIG_JOLIET=y
 # CONFIG_JFS_STATISTICS is not set
 # CONFIG_JME is not set
 CONFIG_JOLIET=y

+# CONFIG_KALLSYMS_ALL is not set

 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 # CONFIG_KALLSYMS is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 # CONFIG_KALLSYMS is not set
 # CONFIG_KARMA_PARTITION is not set


@@ -1126,7 +1128,7 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MAC_PARTITION is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MAC_PARTITION is not set
 # CONFIG_MACVLAN is not set

-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y

 # CONFIG_MARKEINS is not set
 # CONFIG_MARKERS is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MARKERS is not set
 # CONFIG_MARVELL_PHY is not set


@@ -2125,6 +2127,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_SIS7019 is not set
 # CONFIG_SND_SGALAXY is not set
 # CONFIG_SND_SOC is not set
 # CONFIG_SND_SIS7019 is not set
 # CONFIG_SND_SGALAXY is not set
 # CONFIG_SND_SOC is not set

+# CONFIG_SND_SOC_MPC5200_I2S is not set

 # CONFIG_SND_SONICVIBES is not set
 # CONFIG_SND_SPI is not set
 # CONFIG_SND_SSCAPE is not set
 # CONFIG_SND_SONICVIBES is not set
 # CONFIG_SND_SPI is not set
 # CONFIG_SND_SSCAPE is not set


@@ -2235,6 +2238,7 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TICK_ONESHOT=y
 # CONFIG_TIFM_CORE is not set
 # CONFIG_TIGON3 is not set
 CONFIG_TICK_ONESHOT=y
 # CONFIG_TIFM_CORE is not set
 # CONFIG_TIGON3 is not set

+# CONFIG_TIMER_STATS is not set

 CONFIG_TIMERFD=y
 # CONFIG_TINY_SHMEM is not set
 # CONFIG_TIPC is not set
 CONFIG_TIMERFD=y
 # CONFIG_TINY_SHMEM is not set
 # CONFIG_TIPC is not set