diff options
author | Josh Boyer <jwboyer@redhat.com> | 2012-05-23 09:39:12 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2012-05-23 09:39:12 -0400 |
commit | 16cd90df88b49969d6b642983d2d2853ad9e22d7 (patch) | |
tree | ddaea3d6d158fab8033a3141d3884bd46840d7bb /config-generic | |
parent | 50c065d6a1c342bbbe1f6a658c14503f1cc2698a (diff) | |
download | kernel-16cd90df88b49969d6b642983d2d2853ad9e22d7.tar.gz kernel-16cd90df88b49969d6b642983d2d2853ad9e22d7.tar.xz kernel-16cd90df88b49969d6b642983d2d2853ad9e22d7.zip |
Linux v3.4-4842-g61011677
Diffstat (limited to 'config-generic')
-rw-r--r-- | config-generic | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/config-generic b/config-generic index 22e4c0015..0fcce308a 100644 --- a/config-generic +++ b/config-generic @@ -2285,6 +2285,7 @@ CONFIG_SENSORS_MAX1668=m # CONFIG_HMC6352 is not set # CONFIG_BMP085 is not set +# CONFIG_BMP085_I2C is not set # CONFIG_PCH_PHUB is not set # CONFIG_SERIAL_PCH_UART is not set # CONFIG_USB_SWITCH_FSA9480 is not set @@ -3125,6 +3126,7 @@ CONFIG_USB_HID=y CONFIG_HID_SUPPORT=y CONFIG_HID=m +CONFIG_HID_BATTERY_STRENGTH=y # debugging default is y upstream now CONFIG_HIDRAW=y CONFIG_HID_PID=y @@ -3189,6 +3191,9 @@ CONFIG_HID_WIIMOTE_EXT=y CONFIG_HID_KYE=m CONFIG_HID_SAITEK=m CONFIG_HID_TIVO=m +CONFIG_HID_GENERIC=m +CONFIG_HID_AUREAL=m + # # USB Imaging devices @@ -3300,6 +3305,7 @@ CONFIG_USB_EPSON2888=y CONFIG_USB_KC2190=y # CONFIG_USB_MUSB_HDRC is not set +# CONFIG_USB_CHIPIDEA is not set # # USB port drivers @@ -3376,6 +3382,7 @@ CONFIG_USB_SERIAL_QCAUX=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_DEBUG=m CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m CONFIG_USB_SERIAL_CONSOLE=y @@ -3438,6 +3445,8 @@ CONFIG_USB_ZERO=m CONFIG_USB_ANNOUNCE_NEW_DEVICES=y +# CONFIG_USB_ISP1301 is not set + # CONFIG_USB_OTG is not set # @@ -3947,6 +3956,7 @@ CONFIG_CRC_T10DIF=m CONFIG_CRC8=m # CONFIG_CRC7 is not set CONFIG_CORDIC=m +# CONFIG_DDR is not set CONFIG_CRYPTO_ZLIB=m CONFIG_ZLIB_INFLATE=y @@ -4280,6 +4290,8 @@ CONFIG_USB_WUSB_CBAF=m # CONFIG_USB_WUSB_CBAF_DEBUG is not set CONFIG_USB_WHCI_HCD=m CONFIG_USB_HWA_HCD=m +# CONFIG_USB_HCD_BCMA is not set +# CONFIG_USB_HCD_SSB is not set CONFIG_UWB=m CONFIG_UWB_HWA=m @@ -4350,6 +4362,8 @@ CONFIG_ALTERA_STAPL=m # CONFIG_ZSMALLOC is not set # CONFIG_RAMSTER is not set # CONFIG_USB_WPAN_HCD is not set +# CONFIG_WIMAX_GDM72XX is not set +# CONFIG_IPACK_BUS is not set # # END OF STAGING @@ -4395,6 +4409,9 @@ CONFIG_IEEE802154_FAKELB=m CONFIG_MAC802154=m +# CONFIG_EXTCON is not set +# CONFIG_MEMORY is not set + CONFIG_PPS=m # CONFIG_PPS_CLIENT_KTIMER is not set CONFIG_PPS_CLIENT_LDISC=m @@ -4457,6 +4474,7 @@ CONFIG_TCM_FC=m CONFIG_HWSPINLOCK=m CONFIG_PSTORE=y +CONFIG_PSTORE_RAM=m # CONFIG_AVERAGE is not set |