diff options
author | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-08-17 16:06:35 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-08-17 16:07:07 -0400 |
commit | da80d72ecea221386e6642122ab332f2aaa457ce (patch) | |
tree | c3641cd7e7701ae4646367c395e8569aeafb5d35 /config-generic | |
parent | c7a89c25e0dbac3f4d1e2f40ae910f71ebd224b6 (diff) | |
download | kernel-da80d72ecea221386e6642122ab332f2aaa457ce.tar.gz kernel-da80d72ecea221386e6642122ab332f2aaa457ce.tar.xz kernel-da80d72ecea221386e6642122ab332f2aaa457ce.zip |
First pass at 2.6.36-rc1
Diffstat (limited to 'config-generic')
-rw-r--r-- | config-generic | 58 |
1 files changed, 57 insertions, 1 deletions
diff --git a/config-generic b/config-generic index 13dfa01e9..c6f5c4504 100644 --- a/config-generic +++ b/config-generic @@ -496,6 +496,7 @@ CONFIG_SCSI_SAS_HOST_SMP=y CONFIG_RAID_ATTRS=m CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m # # SCSI low-level drivers @@ -719,6 +720,7 @@ CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_SBP2=m CONFIG_FIREWIRE_NET=m CONFIG_FIREWIRE_OHCI_DEBUG=y +CONFIG_FIREWIRE_NOSY=m # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # @@ -845,6 +847,7 @@ CONFIG_DECNET_ROUTER=y # CONFIG_DECNET_NF_GRABULATOR is not set CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y CONFIG_NETFILTER_ADVANCED=y CONFIG_NF_CONNTRACK=y @@ -903,6 +906,10 @@ CONFIG_NETFILTER_XT_MATCH_U32=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_HL=m CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m # CONFIG_NETFILTER_DEBUG is not set CONFIG_BRIDGE_NETFILTER=y @@ -1318,6 +1325,7 @@ CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T3=m CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4VF=m CONFIG_IP1000=m CONFIG_IXGB=m CONFIG_IXGBEVF=m @@ -1513,6 +1521,8 @@ CONFIG_WL1251=m CONFIG_WL1251_SPI=m CONFIG_WL1251_SDIO=m CONFIG_WL1271=m +CONFIG_WL1271_SDIO=m +CONFIG_WL1271_SPI=m # # Token Ring devices @@ -1565,6 +1575,7 @@ CONFIG_CAN_SJA1000_ISA=m CONFIG_CAN_SJA1000_PLATFORM=m CONFIG_CAN_EMS_PCI=m CONFIG_CAN_EMS_USB=m +CONFIG_CAN_ESD_USB2=m CONFIG_CAN_KVASER_PCI=m CONFIG_CAN_PLX_PCI=m CONFIG_NETROM=m @@ -1644,6 +1655,7 @@ CONFIG_BT_HCIBTUSB=m CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIDTL1=m CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBLUECARD=m @@ -1812,6 +1824,7 @@ CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m CONFIG_INPUT_POLLDEV=m CONFIG_INPUT_SPARSEKMAP=m +# CONFIG_INPUT_ADXL34X is not set # # Input I/O drivers @@ -1846,6 +1859,7 @@ CONFIG_KEYBOARD_ATKBD=y # FIXME: Do we really need these keyboards enabled ? CONFIG_KEYBOARD_ADP5588=m CONFIG_KEYBOARD_MAX7359=m +# CONFIG_KEYBOARD_MCS is not set CONFIG_KEYBOARD_OPENCORES=m CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_TCA6416 is not set @@ -1909,6 +1923,8 @@ CONFIG_TOUCHSCREEN_USB_E2I=y CONFIG_TOUCHSCREEN_USB_COMPOSITE=m CONFIG_TOUCHSCREEN_DYNAPRO=m # CONFIG_TOUCHSCREEN_WM97XX is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_QT602240 is not set CONFIG_TOUCHSCREEN_EETI=m CONFIG_TOUCHSCREEN_W90X900=m CONFIG_TOUCHSCREEN_MCS5000=m @@ -1985,6 +2001,7 @@ CONFIG_CYCLADES=m # CONFIG_STALLION is not set # CONFIG_ISTALLION is not set CONFIG_SERIAL_JSM=m +# CONFIG_SERIAL_MFD_HSU is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set @@ -2008,6 +2025,8 @@ CONFIG_PPDEV=m CONFIG_I2C=m CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m +# CONFIG_I2C_MUX is not set +# CONFIG_I2C_MUX_PCA954x is not set # # I2C Algorithms @@ -2153,6 +2172,13 @@ CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ASC7621=m CONFIG_SENSORS_EMC1403=m CONFIG_SENSORS_TMP102=m +# CONFIG_SENSORS_BH1780 is not set +# CONFIG_SENSORS_JC42 is not set +# CONFIG_SENSORS_SMM665 is not set +# CONFIG_SENSORS_EMC2103 is not set + +# CONFIG_HMC6352 is not set +# CONFIG_BMP085 is not set CONFIG_W1=m CONFIG_W1_CON=y @@ -2308,6 +2334,7 @@ CONFIG_DRM_NOUVEAU=m CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_NOUVEAU_DEBUG=y CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_VMWGFX=m # @@ -2974,6 +3001,8 @@ CONFIG_HID_TOPSEED=m CONFIG_HID_THRUSTMASTER=m CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m +CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ELECOM=m # @@ -3038,6 +3067,7 @@ CONFIG_USB_KONICAWC=m CONFIG_USB_S2255=m CONFIG_USB_SE401=m # CONFIG_VIDEO_SH_MOBILE_CEU is not set +# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set # CONFIG_USB_STV680 is not set # CONFIG_USB_SN9C102 is not set CONFIG_USB_ZR364XX=m @@ -3165,6 +3195,7 @@ CONFIG_USB_SERIAL_XIRCOM=m CONFIG_USB_SERIAL_QCAUX=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_DEBUG=m +CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_EZUSB=y CONFIG_USB_EMI62=m @@ -3248,6 +3279,8 @@ CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_CHARGER_PCF50633=m CONFIG_RTC_DRV_PCF50633=m +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_ISL12022=m CONFIG_MFD_SUPPORT=y CONFIG_MFD_SM501=m @@ -3391,7 +3424,8 @@ CONFIG_JFFS2_FS_POSIX_ACL=y CONFIG_JFFS2_FS_SECURITY=y CONFIG_CRAMFS=m CONFIG_SQUASHFS=m -CONFIG_SQUASHFS_XATTRS=y +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_LZO=y # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set @@ -3420,6 +3454,7 @@ CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=m @@ -3591,6 +3626,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_AVC_STATS=y # CONFIG_SECURITY_SMACK is not set # CONFIG_SECURITY_TOMOYO is not set +# CONFIG_SECURITY_APPARMOR is not set CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y @@ -3599,6 +3635,7 @@ CONFIG_AUDITSYSCALL=y # CONFIG_CRYPTO=y CONFIG_CRYPTO_FIPS=y +CONFIG_CRYPTO_MANAGER_TESTS=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_BLKCIPHER=y CONFIG_CRYPTO_MANAGER=m @@ -4167,6 +4204,11 @@ CONFIG_USB_ATMEL=m # CONFIG_RAMZSWAP is not set # CONFIG_BATMAN_ADV is not set # CONFIG_FB_SM7XX is not set +# CONFIG_SPECTRA is not set +# CONFIG_ZRAM is not set +# CONFIG_EASYCAP is not set +# CONFIG_SOLO6X10 is not set +# CONFIG_ACPI_QUICKSTART is not set # # Android @@ -4214,6 +4256,8 @@ CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_FSNOTIFY=y +CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_IEEE802154=m CONFIG_IEEE802154_DRIVERS=m @@ -4253,6 +4297,8 @@ CONFIG_DEBUG_RODATA_TEST=y CONFIG_DEBUG_NX_TEST=m CONFIG_DEBUG_BOOT_PARAMS=y CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_LOCKUP_DETECTOR=y +# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_DETECT_HUNG_TASK=y # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set @@ -4291,3 +4337,13 @@ CONFIG_PROFILE_KSYM_TRACER=y CONFIG_KPROBE_EVENT=y # CONFIG_RAMOOPS is not set + +CONFIG_IR_CORE=m +CONFIG_IR_ENE=m +CONFIG_IR_STREAMZAP=m + +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set +# CONFIG_GPIO_SX150X is not set +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_MAX8998 is not set +# CONFIG_MFD_TPS6586X is not set |