diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-03-22 17:04:14 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-03-22 17:04:14 -0400 |
| commit | 31c46e0c23e3c423b81a13a4d0c60d26ae50120f (patch) | |
| tree | 47876ac7280fc1608abdc04977e2b82b6e8f5a78 /config-generic | |
| parent | c0fad2331547d5377ec05af374c81bc4385a00cb (diff) | |
| download | kernel-31c46e0c23e3c423b81a13a4d0c60d26ae50120f.tar.gz kernel-31c46e0c23e3c423b81a13a4d0c60d26ae50120f.tar.xz kernel-31c46e0c23e3c423b81a13a4d0c60d26ae50120f.zip | |
update to 2.6.38-git11
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/config-generic b/config-generic index 813cb43f7..365b7ccd6 100644 --- a/config-generic +++ b/config-generic @@ -1918,6 +1918,7 @@ CONFIG_KEYBOARD_ATKBD=y # FIXME: Do we really need these keyboards enabled ? CONFIG_KEYBOARD_ADP5588=m CONFIG_KEYBOARD_MAX7359=m +# CONFIG_KEYBOARD_QT1070 is not set # CONFIG_KEYBOARD_MCS is not set CONFIG_KEYBOARD_OPENCORES=m CONFIG_KEYBOARD_QT2160=m @@ -1994,6 +1995,7 @@ CONFIG_TOUCHSCREEN_USB_COMPOSITE=m CONFIG_TOUCHSCREEN_W90X900=m # CONFIG_TOUCHSCREEN_BU21013 is not set CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m @@ -2257,6 +2259,8 @@ CONFIG_SENSORS_SHT21=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_ADS1015=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m @@ -2987,6 +2991,7 @@ CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_USB_USX2Y=m CONFIG_SND_USB_US122L=m CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_6FIRE=m # # PCMCIA devices @@ -2995,6 +3000,9 @@ CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_SPEAKERS=m + # # Open Sound System # @@ -3124,6 +3132,11 @@ CONFIG_HID_UCLOGIC=m CONFIG_HID_WALTOP=m CONFIG_HID_ROCCAT_PYRA=m CONFIG_HID_ROCCAT_KONEPLUS=m +CONFIG_HID_ACRUX=m +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_ROCCAT_ARVO=m +CONFIG_HID_ROCCAT_KOVAPLUS=m # # USB Imaging devices @@ -4546,6 +4559,6 @@ CONFIG_TCM_PSCSI=m CONFIG_HWSPINLOCK=m -# CONFIG_PSTORE is not set ### XXX BROKEN 2011-03-18 due to get_sb removal +CONFIG_PSTORE=y # CONFIG_AVERAGE is not set |