From 0c8eb822de35e14c404803bbd40bd48a81bedc1e Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 31 May 2013 04:14:16 +0000 Subject: [PATCH] Enable various new drivers and driver options svn path=/dists/sid/linux/; revision=20152 --- debian/changelog | 24 +++++++ debian/config/config | 69 +++++++++++++++++++++ debian/config/kernelarch-x86/config | 19 ++++++ debian/config/kernelarch-x86/config-arch-64 | 1 + debian/config/powerpc/config.powerpc64 | 1 + 5 files changed, 114 insertions(+) diff --git a/debian/changelog b/debian/changelog index e15831f8b..8d0d0185f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,30 @@ linux (3.9.4-1) UNRELEASED; urgency=low * bridge: Enable BRIDGE_VLAN_FILTERING * batman: Enable BATMAN_ADV_DAT * nfc: Enable NFC_LLCP + * can: Enable CAN_PEAK_USB, CAN_8DEV_USB as modules + * hci_uart: Enable BT_HCIUART_3WIRE + * [amd64,powerpc/powerpc64,ppc64] block: Enable BLK_DEV_RSXX as module + * SCSI: Enable SCSI_CHELSIO_FCOE, SCSI_MPT3SAS, SCSI_UFSHCD as modules + * md: Enable DM_CACHE as module + * net/usb: Enable USB_NET_AX88179_178A as module + * net/wireless: Enable AR5523, IWLMVM, RTL8723AE, WIL6210 as modules + * serial: Enable SERIAL_RP2 as module + * hw_random: Enable HW_RANDOM_TPM as module + * [x86] watchdog: Enable IE6XX_WDT, VIA_WDT as modules + * media/usb: Enable DVB_USB_AZ6007, USB_GSPCA_JL2005BCD as modules + * stk1160: Enable VIDEO_STK1160_AC97 + * ivtv: Enable VIDEO_IVTV_ALSA as module + * radio: Enable RADIO_SHARK, RADIO_SHARK2, USB_KEENE, USB_MA901 as modules + * hda: Enable SND_HDA_CODEC_CA0132_DSP + * sound/firewire: Enable SND_SCS1X as module + * hid-holtek: Enable HOLTEK_FF + * hid: Enable HID_ICADE, HID_PS3REMOTE, HID_STEELSERIES, HID_THINGM as + modules + * usb/serial: Enable USB_SERIAL_F81232, USB_SERIAL_METRO, USB_SERIAL_QT2, + USB_SERIAL_XSENS_MT, USB_SERIAL_ZTE as modules + * infiniband: Enable INFINIBAND_OCRDMA as module + * [x86] vfio: Enable VFIO, VFIO_PCI as modules + * [x86] hv: Enable HYPERV_BALLOON as module [ Aurelien Jarno ] * [mips] Enable KEXEC. diff --git a/debian/config/config b/debian/config/config index e845a7a1f..3b4f23f72 100644 --- a/debian/config/config +++ b/debian/config/config @@ -269,6 +269,7 @@ CONFIG_BT_HCIBTUSB=m CONFIG_BT_HCIBTSDIO=m CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m CONFIG_BT_ATH3K=m @@ -297,6 +298,7 @@ CONFIG_TELCLOCK=m # CONFIG_HW_RANDOM is not set CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m ## ## file: drivers/char/pcmcia/Kconfig @@ -445,11 +447,13 @@ CONFIG_DRAGONRISE_FF=y CONFIG_HID_EMS_FF=m CONFIG_HID_ELECOM=m CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y CONFIG_HID_KEYTOUCH=m CONFIG_HID_KYE=m CONFIG_HID_UCLOGIC=m CONFIG_HID_WALTOP=m CONFIG_HID_GYRATION=m +CONFIG_HID_ICADE=m CONFIG_HID_TWINHAN=m CONFIG_HID_LCPOWER=m CONFIG_HID_LENOVO_TPKBD=m @@ -467,11 +471,13 @@ CONFIG_PANTHERLORD_FF=y CONFIG_HID_PETALYNX=m CONFIG_HID_PICOLCD=m CONFIG_HID_PRIMAX=m +CONFIG_HID_PS3REMOTE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y @@ -480,10 +486,12 @@ CONFIG_HID_SMARTJOYPLUS=m CONFIG_SMARTJOYPLUS_FF=y CONFIG_HID_TIVO=m CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m CONFIG_HID_THRUSTMASTER=m CONFIG_THRUSTMASTER_FF=y CONFIG_HID_WACOM=m CONFIG_HID_WIIMOTE=m +CONFIG_HID_WIIMOTE_EXT=y CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y CONFIG_HID_ZYDACRON=m @@ -677,6 +685,11 @@ CONFIG_INFINIBAND_MTHCA_DEBUG=y CONFIG_INFINIBAND_NES=m # CONFIG_INFINIBAND_NES_DEBUG is not set +## +## file: drivers/infiniband/hw/ocrdma/Kconfig +## +CONFIG_INFINIBAND_OCRDMA=m + ## ## file: drivers/infiniband/hw/qib/Kconfig ## @@ -966,6 +979,9 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=y +CONFIG_DM_CACHE_CLEANER=y CONFIG_DM_MIRROR=m CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m @@ -1172,6 +1188,7 @@ CONFIG_DVB_DM1105=m ## CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_IVTV_ALSA=m ## ## file: drivers/media/pci/mantis/Kconfig @@ -1270,8 +1287,12 @@ CONFIG_VIDEO_SH_MOBILE_CEU=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_MR800=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m CONFIG_I2C_SI4713=m CONFIG_RADIO_SI4713=m +CONFIG_USB_KEENE=m +CONFIG_USB_MA901=m CONFIG_RADIO_TEA5764=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_TEF6862=m @@ -1338,6 +1359,7 @@ CONFIG_MEDIA_USB_SUPPORT=y ## file: drivers/media/usb/au0828/Kconfig ## CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y ## ## file: drivers/media/usb/b2c2/Kconfig @@ -1393,10 +1415,12 @@ CONFIG_DVB_USB_TECHNISAT_USB2=m ## file: drivers/media/usb/dvb-usb-v2/Kconfig ## CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_CYPRESS_FIRMWARE=m CONFIG_DVB_USB_AF9015=m CONFIG_DVB_USB_AF9035=m CONFIG_DVB_USB_ANYSEE=m CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m CONFIG_DVB_USB_CE6230=m CONFIG_DVB_USB_EC168=m CONFIG_DVB_USB_GL861=m @@ -1423,6 +1447,7 @@ CONFIG_USB_GSPCA_CPIA1=m CONFIG_USB_GSPCA_ETOMS=m CONFIG_USB_GSPCA_FINEPIX=m CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_JL2005BCD=m CONFIG_USB_GSPCA_KINECT=m CONFIG_USB_GSPCA_KONICA=m CONFIG_USB_GSPCA_MARS=m @@ -1514,6 +1539,7 @@ CONFIG_USB_SN9C102=m ## file: drivers/media/usb/stk1160/Kconfig ## CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_STK1160_AC97=y ## ## file: drivers/media/usb/stkwebcam/Kconfig @@ -1864,7 +1890,9 @@ CONFIG_CAN_SOFTING_CS=m ## CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB2=m +CONFIG_CAN_KVASER_USB=m CONFIG_CAN_PEAK_USB=m +CONFIG_CAN_8DEV_USB=m ## ## file: drivers/net/ethernet/Kconfig @@ -1905,6 +1933,7 @@ CONFIG_BNX2=m CONFIG_CNIC=m CONFIG_TIGON3=m CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y ## ## file: drivers/net/ethernet/brocade/Kconfig @@ -1984,6 +2013,7 @@ CONFIG_E1000=m CONFIG_E1000E=m CONFIG_IGB=m CONFIG_IGB_DCA=y +CONFIG_IGB_HWMON=y CONFIG_IGBVF=m CONFIG_IXGB=m CONFIG_IXGBE=m @@ -2274,6 +2304,7 @@ CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_NCM=m @@ -2343,6 +2374,11 @@ CONFIG_MWL8K=m CONFIG_ATH_CARDS=y # CONFIG_ATH_DEBUG is not set +## +## file: drivers/net/wireless/ath/ar5523/Kconfig +## +CONFIG_AR5523=m + ## ## file: drivers/net/wireless/ath/ath5k/Kconfig ## @@ -2378,6 +2414,12 @@ CONFIG_CARL9170_LEDS=y # CONFIG_CARL9170_DEBUGFS is not set # CONFIG_CARL9170_HWRNG is not set +## +## file: drivers/net/wireless/ath/wil6210/Kconfig +## +CONFIG_WIL6210=m +CONFIG_WIL6210_ISR_COR=y + ## ## file: drivers/net/wireless/b43/Kconfig ## @@ -2441,6 +2483,8 @@ CONFIG_IWL3945=m ## file: drivers/net/wireless/iwlwifi/Kconfig ## CONFIG_IWLWIFI=m +CONFIG_IWLDVM=m +CONFIG_IWLMVM=m # CONFIG_IWLWIFI_DEBUG is not set # CONFIG_IWLWIFI_DEVICE_TRACING is not set @@ -2507,6 +2551,7 @@ CONFIG_RTLWIFI=m CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m CONFIG_RTL8192CU=m # CONFIG_RTLWIFI_DEBUG is not set @@ -2846,6 +2891,11 @@ CONFIG_SCSI_BNX2X_FCOE=m ## CONFIG_SCSI_BNX2_ISCSI=m +## +## file: drivers/scsi/csiostor/Kconfig +## +CONFIG_SCSI_CHELSIO_FCOE=m + ## ## file: drivers/scsi/cxgbi/cxgb3i/Kconfig ## @@ -2884,6 +2934,13 @@ CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set +## +## file: drivers/scsi/mpt3sas/Kconfig +## +CONFIG_SCSI_MPT3SAS=m +CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +# CONFIG_SCSI_MPT3SAS_LOGGING is not set + ## ## file: drivers/scsi/mvsas/Kconfig ## @@ -2918,6 +2975,7 @@ CONFIG_SCSI_QLA_ISCSI=m ## file: drivers/scsi/ufs/Kconfig ## CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m ## ## file: drivers/spi/Kconfig @@ -3115,10 +3173,13 @@ CONFIG_SERIAL_MFD_HSU=m # CONFIG_SERIAL_IFX6X60 is not set # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_XILINX_PS_UART is not set +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 ## ## file: drivers/tty/serial/8250/Kconfig ## +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_FOURPORT=m @@ -3259,6 +3320,7 @@ CONFIG_USB_SERIAL_IPAQ=m CONFIG_USB_SERIAL_IR=m CONFIG_USB_SERIAL_EDGEPORT=m CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m CONFIG_USB_SERIAL_GARMIN=m CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m @@ -3267,6 +3329,7 @@ CONFIG_USB_SERIAL_KEYSPAN=m CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m CONFIG_USB_SERIAL_MOS7720=m CONFIG_USB_SERIAL_MOS7715_PARPORT=y CONFIG_USB_SERIAL_MOS7840=m @@ -3290,8 +3353,11 @@ CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_XSENS_MT=m CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m CONFIG_USB_SERIAL_DEBUG=m ## @@ -4961,6 +5027,7 @@ CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 CONFIG_SND_FIREWIRE=y CONFIG_SND_FIREWIRE_SPEAKERS=m CONFIG_SND_ISIGHT=m +CONFIG_SND_SCS1X=m ## ## file: sound/pci/Kconfig @@ -5015,6 +5082,8 @@ CONFIG_SND_HDA_CODEC_HDMI=y CONFIG_SND_HDA_CODEC_CIRRUS=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CA0110=y +CONFIG_SND_HDA_CODEC_CA0132=y +CONFIG_SND_HDA_CODEC_CA0132_DSP=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 0a7da126b..084593171 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -493,6 +493,7 @@ CONFIG_USB_MOUSE=m ## CONFIG_HYPERV=m CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m ## ## file: drivers/hwmon/Kconfig @@ -714,6 +715,11 @@ CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m +## +## file: drivers/mfd/Kconfig +## +CONFIG_LPC_ICH=m + ## ## file: drivers/misc/Kconfig ## @@ -727,6 +733,7 @@ CONFIG_PCH_PHUB=m ## file: drivers/misc/mei/Kconfig ## CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=y ## ## file: drivers/misc/vmw_vmci/Kconfig @@ -1485,6 +1492,16 @@ CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m +## +## file: drivers/vfio/Kconfig +## +CONFIG_VFIO=m + +## +## file: drivers/vfio/pci/Kconfig +## +CONFIG_VFIO_PCI=m + ## ## file: drivers/video/Kconfig ## @@ -1563,6 +1580,7 @@ CONFIG_IB700_WDT=m CONFIG_IBMASR=m CONFIG_WAFER_WDT=m CONFIG_I6300ESB_WDT=m +CONFIG_IE6XX_WDT=m CONFIG_IT8712F_WDT=m CONFIG_HP_WATCHDOG=m CONFIG_HPWDT_NMI_DECODING=y @@ -1571,6 +1589,7 @@ CONFIG_NV_TCO=m CONFIG_60XX_WDT=m CONFIG_SBC8360_WDT=m CONFIG_CPU5_WDT=m +CONFIG_VIA_WDT=m CONFIG_W83627HF_WDT=m CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index efe9b1482..8a950f659 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -48,6 +48,7 @@ CONFIG_ACPI_BGRT=y ## file: drivers/block/Kconfig ## CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_BLK_DEV_RSXX=m ## ## file: drivers/char/agp/Kconfig diff --git a/debian/config/powerpc/config.powerpc64 b/debian/config/powerpc/config.powerpc64 index 0a5b125c8..fb1a90162 100644 --- a/debian/config/powerpc/config.powerpc64 +++ b/debian/config/powerpc/config.powerpc64 @@ -84,6 +84,7 @@ CONFIG_PATA_AMD=m ## file: drivers/block/Kconfig ## # CONFIG_MAC_FLOPPY is not set +CONFIG_BLK_DEV_RSXX=m ## ## file: drivers/char/hw_random/Kconfig