summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorKyle McMartin <kmcmartin@redhat.com>2011-07-24 22:26:26 -0400
committerKyle McMartin <kmcmartin@redhat.com>2011-07-25 09:46:01 -0400
commit4a2041744e262bb41936adfb3db0b85e13c73b11 (patch)
tree13a97fd36359066adc33a220149246cecf9695de /config-generic
parent524b8cb85593696e6867aa30b1c581cf35fb7cbe (diff)
downloadkernel-4a2041744e262bb41936adfb3db0b85e13c73b11.tar.gz
kernel-4a2041744e262bb41936adfb3db0b85e13c73b11.tar.xz
kernel-4a2041744e262bb41936adfb3db0b85e13c73b11.zip
3.0-git3 snapshot
Testing that this part of the spec still works... Hopefully the next release is indeed 3.1.0...
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic17
1 files changed, 17 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index a1ebab70f..6a4cf325b 100644
--- a/config-generic
+++ b/config-generic
@@ -1043,6 +1043,7 @@ CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m
CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m
#
@@ -1347,6 +1348,7 @@ CONFIG_R8169=m
CONFIG_R8169_VLAN=y
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
CONFIG_TIGON3=m
CONFIG_SKY2=m
# CONFIG_SKY2_DEBUG is not set
@@ -1585,6 +1587,7 @@ CONFIG_WL1271_SPI=m
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
CONFIG_RTL8192CU=m
+CONFIG_RTL8192DE=m
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
@@ -1665,6 +1668,8 @@ CONFIG_BAYCOM_PAR=m
CONFIG_BAYCOM_EPP=m
CONFIG_YAM=m
+CONFIG_NFC=m
+
#
# IrDA (infrared) support
#
@@ -2988,6 +2993,7 @@ CONFIG_SND_HDA_INPUT_JACK=y
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
CONFIG_SND_HDA_CODEC_CA0110=y
CONFIG_SND_HDA_CODEC_ANALOG=y
CONFIG_SND_HDA_CODEC_SIGMATEL=y
@@ -3000,10 +3006,12 @@ CONFIG_SND_HDA_CODEC_INTELHDMI=y
CONFIG_SND_HDA_CODEC_SI3054=y
CONFIG_SND_HDA_CODEC_NVHDMI=y
CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CA0132=y
CONFIG_SND_HDA_GENERIC=y
CONFIG_SND_HDA_POWER_SAVE=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_PREALLOC_SIZE=4096
CONFIG_SND_HDSPM=m
CONFIG_SND_HIFIER=m
CONFIG_SND_ICE1712=m
@@ -3195,6 +3203,10 @@ CONFIG_HID_KEYTOUCH=m
CONFIG_HID_LCPOWER=m
CONFIG_HID_ROCCAT_ARVO=m
CONFIG_HID_ROCCAT_KOVAPLUS=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_WIIMOTE=m
#
# USB Imaging devices
@@ -3923,6 +3935,8 @@ CONFIG_CRC32=m
CONFIG_CRC_CCITT=m
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=m
+CONFIG_CRC8=m
+CONFIG_CORDIC=m
CONFIG_CRYPTO_ZLIB=m
CONFIG_ZLIB_INFLATE=y
@@ -4640,6 +4654,7 @@ CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_NFC_DEVICES=y
CONFIG_PN544_NFC=m
+CONFIG_NFC_PN533=m
CONFIG_TARGET_CORE=m
CONFIG_LOOPBACK_TARGET=m
@@ -4667,3 +4682,5 @@ CONFIG_BCMA_HOST_PCI=y
# CONFIG_GOOGLE_FIRMWARE is not set
CONFIG_INTEL_MID_PTI=m
+
+CONFIG_IOMMU_SUPPORT=y