merge swconfig (+drivers) improvements from trunk

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

diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 0ae82935c188df81cfe9b6d70b69e4b835012d4a..16483b73cd4545f13cac408f94f08877321587fe 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -336,6 +336,7 @@ CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPU_IDLE is not set
 # CONFIG_CRAMFS is not set
+CONFIG_CRASHLOG=y
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
@@ -869,7 +870,7 @@ CONFIG_INPUT_MISC=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y
 # CONFIG_IP1000 is not set
-# CONFIG_IP175C_PHY is not set
+# CONFIG_IP17XX_PHY is not set
 # CONFIG_IP6_NF_FILTER is not set
 # CONFIG_IP6_NF_IPTABLES is not set
 # CONFIG_IP6_NF_MANGLE is not set
@@ -1008,6 +1009,7 @@ CONFIG_IPW2200_MONITOR=y
 # CONFIG_ISCSI_TCP is not set
 CONFIG_ISDN=y
 # CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI is not set
 # CONFIG_ISDN_CAPI_CAPIDRV is not set
 # CONFIG_ISDN_DIVERSION is not set
 # CONFIG_ISDN_DRV_ACT2000 is not set
@@ -1019,6 +1021,7 @@ CONFIG_ISDN=y
 # CONFIG_ISDN_DRV_PCBIT is not set
 # CONFIG_ISDN_DRV_SC is not set
 # CONFIG_ISDN_DRV_TPAM is not set
+# CONFIG_ISDN_I4L is not set
 # CONFIG_ISDN_WITH_ABC is not set
 # CONFIG_ISL29003 is not set
 # CONFIG_ISO9660_FS is not set
@@ -1054,6 +1057,7 @@ CONFIG_JFFS2_ZLIB=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
@@ -2164,7 +2168,6 @@ CONFIG_SQUASHFS_LZMA=y
 CONFIG_SQUASHFS_SUPPORT_ZLIB=y
 # CONFIG_SQUASHFS_VMALLOC is not set
 CONFIG_SQUASHFS=y
-# CONFIG_SSB_BLOCKIO is not set
 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB is not set
 # CONFIG_SSB_PCMCIAHOST is not set
@@ -2230,6 +2233,7 @@ CONFIG_TEXTSEARCH=y
 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