[cavium-octeon] update to 2.6.30-rc5

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

diff --git a/target/linux/generic-2.6/config-2.6.29 b/target/linux/generic-2.6/config-2.6.29
index 2431f38..e05ed7e 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.29
+++ b/target/linux/generic-2.6/config-2.6.29
@@ -61,6 +61,7 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_ATM_LANE is not set
 # CONFIG_ATM_MPOA is not set
 # CONFIG_ATM_NICSTAR is not set
+# CONFIG_ATM_SOLOS is not set
 # CONFIG_ATM_TCP is not set
 # CONFIG_ATM_ZATM is not set
 # CONFIG_AUDIT is not set
@@ -381,6 +382,9 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_ECONET is not set
 # CONFIG_EEPRO100 is not set
 # CONFIG_EEPROM_93CX6 is not set
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_ELF_CORE is not set
@@ -451,6 +455,7 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_SYSFS is not set
 # CONFIG_GPIO_XILINX is not set
+# CONFIG_GREENASIA_FF is not set
 # CONFIG_GROUP_SCHED is not set
 # CONFIG_HAMACHI is not set
 CONFIG_HAMRADIO=y
@@ -559,6 +564,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_VOODOO3 is not set
 # CONFIG_I2O is not set
 # CONFIG_I82092 is not set
+# CONFIG_I82365 is not set
 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
 # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
 # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
@@ -641,7 +647,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
@@ -652,6 +658,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_INPUT_TSDEV is not set
 # CONFIG_INPUT_UINPUT is not set
 # CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_INPUT_YEALINK is not set
 # CONFIG_INSTRUMENTATION is not set
 # CONFIG_IOSCHED_AS is not set
 # CONFIG_IOSCHED_CFQ is not set
@@ -858,11 +865,13 @@ CONFIG_LEDS_TRIGGER_NETDEV=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEGACY_PTYS is not set
+# CONFIG_LIB80211_DEBUG is not set
 # CONFIG_LIBCRC32C is not set
 # CONFIG_LIBERTAS is not set
 # CONFIG_LIBERTAS_THINFIRM is not set
 # CONFIG_LIBERTAS_USB is not set
 # CONFIG_LIBFC is not set
+# CONFIG_LIBIPW_DEBUG is not set
 # CONFIG_LLC2 is not set
 CONFIG_LLC=y
 CONFIG_LOCALVERSION=""
@@ -919,6 +928,7 @@ CONFIG_MINI_FO=y
 # CONFIG_MINIX_SUBPARTITION is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_MISDN_HFCPCI is not set
+# CONFIG_MISDN_HFCUSB is not set
 # CONFIG_MISDN is not set
 # CONFIG_MKISS is not set
 # CONFIG_MMC_ARMMMCI is not set
@@ -1101,6 +1111,7 @@ CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
 # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
 # CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_IMQ is not set
 # CONFIG_NETFILTER_XT_TARGET_MARK is not set
 # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
 # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
@@ -1867,6 +1878,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYSVIPC=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_TCG_TPM is not set
+# CONFIG_TCIC is not set
 CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_BIC is not set
 # CONFIG_TCP_CONG_CUBIC is not set
@@ -2065,11 +2077,13 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 # CONFIG_USB_SERIAL_MOTOROLA is not set
 # CONFIG_USB_SERIAL_NAVMAN is not set
 # CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_OPTICON is not set
 # CONFIG_USB_SERIAL_OPTION is not set
 # CONFIG_USB_SERIAL_OTI6858 is not set
 # CONFIG_USB_SERIAL_PL2303 is not set
 # CONFIG_USB_SERIAL_SAFE is not set
 CONFIG_USB_SERIAL_SAFE_PADDED=y
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
 # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
 # CONFIG_USB_SERIAL_SPCP8X5 is not set
 # CONFIG_USB_SERIAL_TI is not set
@@ -2184,6 +2198,7 @@ CONFIG_USB_STORAGE_USBAT=y
 # CONFIG_VIDEO_TEA6420 is not set
 # CONFIG_VIDEO_TLV320AIC23B is not set
 # CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TVP514X is not set
 # CONFIG_VIDEO_TVP5150 is not set
 # CONFIG_VIDEO_UPD64031A is not set
 # CONFIG_VIDEO_UPD64083 is not set
@@ -2217,6 +2232,7 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_W1_MASTER_GPIO is not set
 # CONFIG_W1_MASTER_MATROX is not set
 # CONFIG_W1_SLAVE_BQ27000 is not set
+# CONFIG_W1_SLAVE_DS2431 is not set
 # CONFIG_W1_SLAVE_DS2433 is not set
 # CONFIG_W1_SLAVE_DS2760 is not set
 # CONFIG_W1_SLAVE_SMEM is not set