Linux 2.6.36-git8

1 files changed, 40 insertions, 3 deletions

diff --git a/config-generic b/config-generic
index b97545100..3c3e26060 100644
--- a/config-generic
+++ b/config-generic
@@ -154,6 +154,7 @@ CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
 CONFIG_INFINIBAND_CXGB3=m
 CONFIG_INFINIBAND_CXGB4=m
+CONFIG_SCSI_CXGB4_ISCSI=m
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_INFINIBAND_NES=m
@@ -365,6 +366,7 @@ CONFIG_BLK_DEV_DELKIN=m
 CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_THROTTLING=y
 
 
 #
@@ -759,6 +761,7 @@ CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_NF_SECURITY=m
 # CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
 CONFIG_IP_MROUTE=y
@@ -797,6 +800,7 @@ CONFIG_IP_VS_SH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_PE_SIP=m
 
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
@@ -1100,6 +1104,7 @@ CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_CSUM=m
 
 CONFIG_DCB=y
 
@@ -1150,6 +1155,7 @@ CONFIG_ATM_FORE200E_TX_RETRY=16
 CONFIG_ATM_FORE200E_DEBUG=0
 
 CONFIG_ATM_HE=m
+CONFIG_PPTP=m
 CONFIG_PPPOATM=m
 CONFIG_PPPOL2TP=m
 CONFIG_ATM_NICSTAR=m
@@ -1195,6 +1201,7 @@ CONFIG_FIXED_PHY=y
 CONFIG_MDIO_BITBANG=m
 CONFIG_NATIONAL_PHY=m
 CONFIG_ICPLUS_PHY=m
+CONFIG_BCM63XX_PHY=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_MARVELL_PHY=m
@@ -1212,6 +1219,12 @@ CONFIG_NET_VENDOR_3COM=y
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
 CONFIG_DNET=m
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_DA is not set
+# CONFIG_STMMAC_DUAL_MAC is not set
+# CONFIG_STMMAC_TIMER is not set
+
+# CONFIG_PCH_GBE is not set
 
 #
 # Tulip family network device support
@@ -1329,6 +1342,7 @@ CONFIG_MLX4_EN=m
 # CONFIG_MLX4_DEBUG is not set
 CONFIG_QLCNIC=m
 CONFIG_QLGE=m
+CONFIG_BNA=m
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
 CONFIG_BE2NET=m
@@ -1408,6 +1422,9 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_DEBUGFS=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
 CONFIG_AT76C50X_USB=m
 CONFIG_AIRO=m
 CONFIG_AIRO_CS=m
@@ -1462,6 +1479,7 @@ CONFIG_IWL4965=y
 CONFIG_IWL5000=y
 CONFIG_IWL3945=m
 CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
+# CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE is not set
 CONFIG_IWM=m
 # CONFIG_IWM_DEBUG is not set
 # CONFIG_IWM_TRACING is not set
@@ -1800,6 +1818,7 @@ CONFIG_INPUT_TABLET=y
 CONFIG_TABLET_USB_ACECAD=m
 CONFIG_TABLET_USB_AIPTEK=m
 CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
 CONFIG_TABLET_USB_KBTAB=m
 CONFIG_TABLET_USB_WACOM=m
 
@@ -1823,6 +1842,7 @@ CONFIG_SERIO_I8042=y
 CONFIG_SERIO_SERPORT=y
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
+# CONFIG_SERIO_PS2MULT is not set
 
 # CONFIG_SERIO_CT82C710 is not set
 # CONFIG_SERIO_PARKBD is not set
@@ -1916,6 +1936,7 @@ CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 # CONFIG_TOUCHSCREEN_WM97XX is not set
 CONFIG_TOUCHSCREEN_W90X900=m
+# CONFIG_TOUCHSCREEN_BU21013 is not set
 
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
@@ -2159,13 +2180,16 @@ CONFIG_SENSORS_ADT7411=m
 CONFIG_SENSORS_ASC7621=m
 CONFIG_SENSORS_EMC1403=m
 CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_LTC4261=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_SENSORS_GPIO_FAN is not set
 
 # CONFIG_HMC6352 is not set
 # CONFIG_BMP085 is not set
+# CONFIG_PCH_PHUB is not set
 
 CONFIG_W1=m
 CONFIG_W1_CON=y
@@ -2747,6 +2771,7 @@ CONFIG_SND_DYNAMIC_MINORS=y
 # Generic devices
 #
 CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_MTPAV=m
 CONFIG_SND_MTS64=m
@@ -2765,6 +2790,8 @@ CONFIG_SND_AD1889=m
 # CONFIG_SND_WAVEFRONT is not set
 # CONFIG_SND_MSND_PINNACLE is not set
 # CONFIG_SND_MSND_CLASSIC is not set
+# CONFIG_SND_AZT1605 is not set
+# CONFIG_SND_AZT2316 is not set
 
 #
 # PCI devices
@@ -2819,6 +2846,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=y
 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_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
@@ -2936,6 +2964,8 @@ CONFIG_USB_STORAGE_ONETOUCH=y
 CONFIG_USB_STORAGE_ALAUDA=y
 CONFIG_USB_STORAGE_KARMA=y
 # CONFIG_USB_LIBUSUAL is not set
+CONFIG_USB_UAS=m
+
 
 #
 # USB Human Interface Devices (HID)
@@ -2949,6 +2979,7 @@ CONFIG_HID=m
 CONFIG_HIDRAW=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_LOGIWII_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
@@ -2990,7 +3021,9 @@ CONFIG_HID_ZEROPLUS=m
 CONFIG_HID_ZYDACRON=m
 CONFIG_HID_ACRUX_FF=m
 CONFIG_HID_ELECOM=m
-
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_ROCCAT_PYRA=m
 
 #
 # USB Imaging devices
@@ -3091,6 +3124,7 @@ CONFIG_USB_NET_RNDIS_HOST=m
 CONFIG_USB_NET_CDC_SUBSET=m
 CONFIG_USB_NET_CDC_EEM=m
 CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
 CONFIG_USB_NET_INT51X1=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_IPHETH=m
@@ -3183,6 +3217,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_SAMBA=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -3216,6 +3251,7 @@ CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_OXU210HP_HCD is not set
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
 CONFIG_USB_VST=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
@@ -3445,6 +3481,7 @@ CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
@@ -3747,6 +3784,7 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
 
+# CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 
 CONFIG_RELAY=y
@@ -4065,8 +4103,6 @@ CONFIG_RESOURCE_COUNTERS=y
 #FIXME: x86 generic?
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_I8K=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_X38=m
 CONFIG_INPUT_APANEL=m
 
 # CONFIG_INTEL_MENLOW is not set
@@ -4117,6 +4153,7 @@ CONFIG_NET_SCH_MULTIQ=m
 CONFIG_NET_ACT_SKBEDIT=m
 
 CONFIG_PHONET=m
+# CONFIG_PHONET_PIPECTRLR is not set
 
 CONFIG_ICS932S401=m
 # CONFIG_C2PORT is not set