diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-01-12 21:32:50 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-01-12 21:32:50 -0500 |
| commit | 50f89b26c68e07fc2093e104ddf5314b9c951d76 (patch) | |
| tree | 1f929e8b9913b84aec95bd596d8618f9fc817c1c /config-generic | |
| parent | ae502d2a45dcf802ff9c088fdee661ab06819f2c (diff) | |
| download | kernel-50f89b26c68e07fc2093e104ddf5314b9c951d76.tar.gz kernel-50f89b26c68e07fc2093e104ddf5314b9c951d76.tar.xz kernel-50f89b26c68e07fc2093e104ddf5314b9c951d76.zip | |
update kconfig for 2.6.37-git9
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config-generic b/config-generic index e00002edf..e885bca39 100644 --- a/config-generic +++ b/config-generic @@ -123,6 +123,7 @@ CONFIG_SDIO_UART=m # CONFIG_MMC_TEST is not set # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set +# CONFIG_MMC_CLKGATE is not set CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_BOUNCE=y @@ -564,6 +565,7 @@ CONFIG_SATA_SX4=m CONFIG_SATA_ULI=m CONFIG_SATA_VIA=m CONFIG_SATA_VITESSE=m +CONFIG_SATA_ACARD_AHCI=m CONFIG_PATA_ACPI=m CONFIG_PATA_ALI=m @@ -2211,6 +2213,8 @@ CONFIG_SENSORS_LTC4261=m # CONFIG_SENSORS_GPIO_FAN is not set CONFIG_SENSORS_W83795=m # CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_SHT21=m # CONFIG_HMC6352 is not set # CONFIG_BMP085 is not set @@ -3061,10 +3065,12 @@ CONFIG_HID_THRUSTMASTER=m CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HID_ACRUX_FF=m +CONFIG_HID_EMS_FF=m CONFIG_HID_ELECOM=m CONFIG_HID_UCLOGIC=m CONFIG_HID_WALTOP=m CONFIG_HID_ROCCAT_PYRA=m +CONFIG_HID_ROCCAT_KONEPLUS=m # # USB Imaging devices @@ -3795,6 +3801,8 @@ CONFIG_ZLIB_DEFLATE=m CONFIG_INITRAMFS_SOURCE="" CONFIG_KEYS=y +CONFIG_TRUSTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=m CONFIG_KEYS_DEBUG_PROC_KEYS=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 @@ -4303,6 +4311,9 @@ CONFIG_USB_ATMEL=m # CONFIG_BCM_WIMAX is not set # CONFIG_FT1000 is not set # CONFIG_SPEAKUP is not set +# CONFIG_DX_SEP is not set +# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set +# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set # # Android |