[kernel] 2.6.31: update generic config

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17367 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 31 insertions, 0 deletions

diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index 2465a63fbc2..2466005bd86 100644
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -1,7 +1,18 @@
+# CONFIG_REDWOOD is not set
+# CONFIG_SIMPLE_GPIO is not set
+# CONFIG_PPC_16K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PCIEASPM is not set
+# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
+# CONFIG_HVC_UDBG is not set
+CONFIG_STDBINUTILS=y
 # CONFIG_6PACK is not set
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
 # CONFIG_9P_FS is not set
+# CONFIG_AB3100_CORE is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_ACENIC is not set
 # CONFIG_ACORN_PARTITION is not set
@@ -175,6 +186,7 @@ CONFIG_BINFMT_ELF=y
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_IT8172 is not set
 # CONFIG_BLK_DEV_IT8213 is not set
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_JMICRON is not set
@@ -277,6 +289,7 @@ CONFIG_CARDBUS=y
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
 # CONFIG_CASSINI is not set
+# CONFIG_CB710_CORE is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_CFG80211 is not set
@@ -300,6 +313,7 @@ CONFIG_CLASSIC_RCU=y
 CONFIG_CLS_U32_MARK=y
 CONFIG_CLS_U32_PERF=y
 CONFIG_CMDLINE=""
+# CONFIG_CNIC is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_COMPAT_NET_DEV_OPS=y
@@ -400,6 +414,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEFAULT_DEADLINE=y
 # CONFIG_DEFAULT_HTCP is not set
 CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFAULT_NOOP is not set
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="westwood"
@@ -437,6 +452,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_AT25 is not set
 # CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_ELF_CORE is not set
@@ -463,6 +479,7 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_EXT4_FS is not set
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_EXTRA_TARGETS=""
+# CONFIG_EZX_PCAP is not set
 # CONFIG_FAIR_GROUP_SCHED is not set
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
@@ -497,6 +514,7 @@ CONFIG_FUTEX=y
 CONFIG_FW_LOADER=y
 CONFIG_GACT_PROB=y
 # CONFIG_GAMEPORT is not set
+# CONFIG_GCOV_KERNEL is not set
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HWEIGHT=y
@@ -542,10 +560,13 @@ CONFIG_HAMRADIO=y
 # CONFIG_HID_EZKEY is not set
 # CONFIG_HID_FF is not set
 # CONFIG_HID_GYRATION is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_KYE is not set
 # CONFIG_HID is not set
 # CONFIG_HID_LOGITECH is not set
 # CONFIG_HID_MICROSOFT is not set
 # CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_NTRIG is not set
 # CONFIG_HID_PANTHERLORD is not set
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_PID is not set
@@ -554,6 +575,7 @@ CONFIG_HAMRADIO=y
 # CONFIG_HID_SONY is not set
 # CONFIG_HID_SUNPLUS is not set
 # CONFIG_HID_SUPPORT is not set
+# CONFIG_HID_TOPSEED is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
@@ -657,6 +679,7 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_IEEE80211 is not set
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 # CONFIG_IEEE80211_SOFTMAC is not set
+# CONFIG_IEEE802154 is not set
 # CONFIG_IFB is not set
 # CONFIG_IGB is not set
 # CONFIG_IGBVF is not set
@@ -916,17 +939,21 @@ CONFIG_JOLIET=y
 # CONFIG_KMEMTRACE is not set
 CONFIG_KMOD=y
 # CONFIG_KPROBES is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
 # CONFIG_LANMEDIA is not set
 # CONFIG_LAPB is not set
 # CONFIG_LASAT is not set
 # CONFIG_LATENCYTOP is not set
 # CONFIG_LBD is not set
+# CONFIG_LBDAF is not set
 # CONFIG_LDM_PARTITION is not set
 # CONFIG_LEDS_ALIX is not set
 # CONFIG_LEDS_BD2802 is not set
 CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_PCA955X is not set
@@ -977,6 +1004,7 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_MD is not set
 # CONFIG_MEDIA_ATTACH is not set
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+# CONFIG_MEDIA_SUPPORT is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_SAS is not set
@@ -1407,6 +1435,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PATA_RADISYS is not set
 # CONFIG_PATA_RZ1000 is not set
 # CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
 # CONFIG_PATA_SERVERWORKS is not set
 # CONFIG_PATA_SIL680 is not set
 # CONFIG_PATA_SIS is not set
@@ -1471,6 +1500,7 @@ CONFIG_PPP_MULTILINK=y
 # CONFIG_PPPOE is not set
 # CONFIG_PPPOL2TP is not set
 # CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPS is not set
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_RCU is not set
@@ -1579,6 +1609,7 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
 # CONFIG_RTL8180 is not set
 # CONFIG_RTL8187 is not set
+# CONFIG_RTL8306_PHY is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_S2IO is not set