another round of kernel config cleanups

SVN-Revision: 18370

1 files changed, 8 insertions, 2 deletions

diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index 9516199090..545cecb167 100644
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -1,4 +1,3 @@
-# CONFIG_CPU_FREQ is not set
 # CONFIG_6PACK is not set
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
@@ -83,6 +82,7 @@ CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATA_GENERIC is not set
 # CONFIG_ATA is not set
 # CONFIG_ATALK is not set
+# CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_ATARI_PARTITION is not set
 CONFIG_ATA_SFF=y
@@ -129,6 +129,7 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_B44 is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BASE_FULL=y
+CONFIG_BASE_SMALL=0
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_BATTERY_BQ27000_HDQ is not set
 # CONFIG_BATTERY_BQ27x00 is not set
@@ -336,6 +337,7 @@ CONFIG_CONSTRUCTORS=y
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_FREQ is not set
 # CONFIG_CPU_IDLE is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_CRASH_DUMP is not set
@@ -419,6 +421,7 @@ CONFIG_CRYPTO_ZLIB=y
 # CONFIG_DAB is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DCB is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
@@ -1234,6 +1237,7 @@ CONFIG_MTD=y
 # CONFIG_MYRI10GE is not set
 # CONFIG_NAMESPACES is not set
 # CONFIG_NATIONAL_PHY is not set
+# CONFIG_NATSEMI is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_NEC_MARKEINS is not set
@@ -1483,6 +1487,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
+# CONFIG_NVRAM is not set
 # CONFIG_OCF_BENCH is not set
 # CONFIG_OCF_EP80579 is not set
 # CONFIG_OCF_HIFNHIPP is not set
@@ -1562,12 +1567,12 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PCIEASPM is not set
 # CONFIG_PCI_HERMES is not set
 # CONFIG_PCI_IOV is not set
-# CONFIG_PCI is not set
 # CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_MSI is not set
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_STUB is not set
+CONFIG_PCI=y
 # CONFIG_PCMCIA_AHA152X is not set
 # CONFIG_PCMCIA_ATMEL is not set
 # CONFIG_PCMCIA_DEBUG is not set
@@ -2182,6 +2187,7 @@ CONFIG_TEXTSEARCH=y
 # CONFIG_THERMAL_HWMON is not set
 # CONFIG_THERMAL is not set
 # CONFIG_THRUSTMASTER_FF is not set
+CONFIG_TICK_ONESHOT=y
 # CONFIG_TIFM_CORE is not set
 # CONFIG_TIGON3 is not set
 CONFIG_TIMERFD=y