diff options
| author | Ben Hutchings <benh@debian.org> | 2010-10-03 19:49:27 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2010-10-03 19:49:27 +0000 |
| commit | 97aecd8d076177a851a20c24d17e7880321607ad (patch) | |
| tree | 8893eb2a38b8c2c4fcfd1b3b43031470471d66fb | |
| parent | 626cb3aaa21771e7f640df1c5a50e54211c4fcc4 (diff) | |
| download | kernel_replicant_linux-97aecd8d076177a851a20c24d17e7880321607ad.tar.gz kernel_replicant_linux-97aecd8d076177a851a20c24d17e7880321607ad.tar.bz2 kernel_replicant_linux-97aecd8d076177a851a20c24d17e7880321607ad.zip | |
Enable various new driver modules and driver options
svn path=/dists/trunk/linux-2.6/; revision=16395
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/config/config | 17 |
2 files changed, 22 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 56c35f3182f1..56e0b5387671 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,9 +15,11 @@ linux-2.6 (2.6.36~rc6-1~experimental.1) UNRELEASED; urgency=low NETFILTER_XT_MATCH_CPU, NETFILTER_XT_MATCH_IPVS * Reenable LOCKUP_DETECTOR, accidentally disabled by the previous version * Enable modular AD525X_DPOT_I2C, ATM_NICSTAR, CAN_ESD_USB2, CHELSIO_T4VF, - FIREWIRE_NOSY, MTD_PCMCIA, ORINOCO_USB, PPS_CLIENT_LDISC, RAMOOPS, - SERIAL_MFD_HSU, WL1271_SDIO, WL1271_SPI - * Enable BT_HCIUART_ATH3K + FIREWIRE_NOSY, HID_ACRUX_FF, HID_ELECOM, INFINIBAND_CXGB4, INFINIBAND_QIB, + MTD_PCMCIA, ORINOCO_USB, PPS_CLIENT_LDISC, RAMOOPS, SERIAL_MFD_HSU, + UIO_NETX, USB_GSPCA_SPCA1528, USB_GSPCA_SQ930X, USB_SERIAL_SSU100, + USB_SERIAL_ZIO, WL1271_SDIO, WL1271_SPI + * Enable BT_HCIUART_ATH3K, USB_SERIAL_MOS7715_PARPORT * [x86] Enable modular SENSORS_PKGTEMP * Enable modular IR_CORE, RC_MAP, all IR decoders, IR_IMON, IR_MCEUSB, IR_ENE, IR_STREAMZAP diff --git a/debian/config/config b/debian/config/config index 9981975e0dc0..44da25170e10 100644 --- a/debian/config/config +++ b/debian/config/config @@ -363,7 +363,9 @@ CONFIG_DRM_VMWGFX=m ## file: drivers/hid/Kconfig ## CONFIG_HID_3M_PCT=m +CONFIG_HID_ACRUX_FF=m CONFIG_HID_CANDO=m +CONFIG_HID_ELECOM=m CONFIG_HID_PRODIKEYS=m CONFIG_DRAGONRISE_FF=y CONFIG_HID_DRAGONRISE=m @@ -549,6 +551,11 @@ CONFIG_INFINIBAND_CXGB3=m # CONFIG_INFINIBAND_CXGB3_DEBUG is not set ## +## file: drivers/infiniband/hw/cxgb4/Kconfig +## +CONFIG_INFINIBAND_CXGB4=m + +## ## file: drivers/infiniband/hw/ipath/Kconfig ## CONFIG_INFINIBAND_IPATH=m @@ -571,6 +578,10 @@ CONFIG_INFINIBAND_NES=m # CONFIG_INFINIBAND_NES_DEBUG is not set ## +## file: drivers/infiniband/hw/qib/Kconfig +CONFIG_INFINIBAND_QIB=m + +## ## file: drivers/infiniband/ulp/ipoib/Kconfig ## CONFIG_INFINIBAND_IPOIB=m @@ -1206,8 +1217,10 @@ CONFIG_USB_GSPCA_SPCA505=m CONFIG_USB_GSPCA_SPCA506=m CONFIG_USB_GSPCA_SPCA508=m CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m CONFIG_USB_GSPCA_SQ905=m CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m CONFIG_USB_GSPCA_STK014=m CONFIG_USB_GSPCA_STV0680=m CONFIG_USB_GSPCA_SUNPLUS=m @@ -2572,6 +2585,7 @@ CONFIG_UIO_PDRV_GENIRQ=m CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m ## ## file: drivers/usb/Kconfig @@ -2699,6 +2713,7 @@ CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y CONFIG_USB_SERIAL_MOS7840=m CONFIG_USB_SERIAL_MOTOROLA=m CONFIG_USB_SERIAL_NAVMAN=m @@ -2720,6 +2735,8 @@ CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_DEBUG=m ## |