[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / generic-2.6 / config-2.6.21

diff --git a/target/linux/generic-2.6/config-2.6.21 b/target/linux/generic-2.6/config-2.6.21
index e2d9e50..d9749c0 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.21
+++ b/target/linux/generic-2.6/config-2.6.21
@@ -1,4 +1,3 @@
-
 # CONFIG_6PACK is not set
 # CONFIG_8139CP is not set
 # CONFIG_9P_FS is not set
@@ -447,7 +446,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_PCSPKR is not set
@@ -1071,8 +1070,31 @@ CONFIG_RAMFS=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_RTC_CLASS is not set
+# CONFIG_RTC_DEBUG is not set
 CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_PCF50606 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_HCTOSYS=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_LIB=y
 CONFIG_RT_MUTEXES=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_S2IO is not set
 # CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_MV is not set
@@ -1341,10 +1363,12 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_WAVEFRONT is not set
 # CONFIG_SND_YMFPCI is not set
 # CONFIG_SNI_RM is not set
+# CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
 # CONFIG_SOUND is not set
 # CONFIG_SOUND_PRIME is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
@@ -1370,6 +1394,7 @@ CONFIG_SYSCTL=y
 CONFIG_SYSFS=y
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_SYSV_FS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYSVIPC=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_TCG_TPM is not set