From 41ccb6caac90f9620656e4bf6b3f2b5ebe65690d Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Tue, 9 Dec 2014 22:11:37 +0000
Subject: [PATCH] Enable various new drivers

svn path=/dists/trunk/linux/; revision=22176
---
 debian/changelog                    |  9 ++++++++
 debian/config/config                | 36 +++++++++++++++++++++++++++++
 debian/config/kernelarch-x86/config | 10 --------
 3 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6f48f4f14..361bf054f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,15 @@ linux (3.18-1~exp1) UNRELEASED; urgency=medium
     ARCH_KIRKWOOD etc.
   * [powerpc/powerpc64,ppc64*] Enable SCSI_IBMVFC as module, replacing
     SCSI_IBMVSCSIS
+  * input/tablet: Enable TABLET_SERIAL_WACOM4 as module
+  * media: Enable MEDIA_SDR_SUPPORT; enable DVB_PT3, DVB_USB_DVBSKY,
+    USB_AIRSPY, USB_HACKRF, VIDEO_TW68 as modules; enable VIDEO_SOLO6X10 as
+    module on all architectures (replacing SOLO6X10 on x86);
+    enable USB_MSI2500 on all architectures (replacing USB_MSI3101 on x86)
+  * au0828: Enable VIDEO_AU0828_RC
+  * HID,gpio,i2c: Enable HID_CP2112 as module
+  * HID: Enable HID_PENMOUNT as module
+  * USB,leds: Enable USB_LED_TRIG
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 09 Dec 2014 02:08:47 +0000
 
diff --git a/debian/config/config b/debian/config/config
index 9abaccb88..aae2aad58 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -573,6 +573,7 @@ CONFIG_HID_BELKIN=y
 CONFIG_HID_CHERRY=y
 CONFIG_HID_CHICONY=y
 CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CP2112=m
 CONFIG_HID_CYPRESS=y
 CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
@@ -608,6 +609,7 @@ CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
 CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
 CONFIG_HID_PETALYNX=m
 CONFIG_HID_PICOLCD=m
 CONFIG_HID_PICOLCD_FB=y
@@ -1192,6 +1194,7 @@ CONFIG_TABLET_USB_AIPTEK=m
 CONFIG_TABLET_USB_GTCO=m
 CONFIG_TABLET_USB_HANWANG=m
 CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_SERIAL_WACOM4=m
 
 ##
 ## file: drivers/input/touchscreen/Kconfig
@@ -1651,6 +1654,11 @@ CONFIG_DVB_PLUTO2=m
 ##
 CONFIG_DVB_PT1=m
 
+##
+## file: drivers/media/pci/pt3/Kconfig
+##
+CONFIG_DVB_PT3=m
+
 ##
 ## file: drivers/media/pci/saa7134/Kconfig
 ##
@@ -1671,6 +1679,11 @@ CONFIG_VIDEO_MXB=m
 ##
 CONFIG_VIDEO_SAA7164=m
 
+##
+## file: drivers/media/pci/solo6x10/Kconfig
+##
+CONFIG_VIDEO_SOLO6X10=m
+
 ##
 ## file: drivers/media/pci/ttpci/Kconfig
 ##
@@ -1682,6 +1695,11 @@ CONFIG_DVB_BUDGET_CI=m
 CONFIG_DVB_BUDGET_AV=m
 CONFIG_DVB_BUDGET_PATCH=m
 
+##
+## file: drivers/media/pci/tw68/Kconfig
+##
+CONFIG_VIDEO_TW68=m
+
 ##
 ## file: drivers/media/pci/zoran/Kconfig
 ##
@@ -1808,11 +1826,17 @@ CONFIG_MEDIA_TUNER_QT1010=m
 ##
 CONFIG_MEDIA_USB_SUPPORT=y
 
+##
+## file: drivers/media/usb/airspy/Kconfig
+##
+CONFIG_USB_AIRSPY=m
+
 ##
 ## file: drivers/media/usb/au0828/Kconfig
 ##
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
 
 ##
 ## file: drivers/media/usb/b2c2/Kconfig
@@ -1879,6 +1903,7 @@ CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_USB_MXL111SF=m
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 
 ##
 ## file: drivers/media/usb/em28xx/Kconfig
@@ -1954,11 +1979,21 @@ CONFIG_USB_M5602=m
 ##
 CONFIG_USB_STV06XX=m
 
+##
+## file: drivers/media/usb/hackrf/Kconfig
+##
+CONFIG_USB_HACKRF=m
+
 ##
 ## file: drivers/media/usb/hdpvr/Kconfig
 ##
 CONFIG_VIDEO_HDPVR=m
 
+##
+## file: drivers/media/usb/msi2500/Kconfig
+##
+CONFIG_USB_MSI2500=m
+
 ##
 ## file: drivers/media/usb/pvrusb2/Kconfig
 ##
@@ -4063,6 +4098,7 @@ CONFIG_UIO_MF624=m
 ## file: drivers/usb/Kconfig
 ##
 CONFIG_USB_SUPPORT=y
+CONFIG_USB_LED_TRIG=y
 
 ##
 ## file: drivers/usb/atm/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 681d0f2f6..6eb3e8fae 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -724,11 +724,6 @@ CONFIG_LEDS_CLEVO_MAIL=m
 ##
 CONFIG_DVB_RTL2832_SDR=m
 
-##
-## file: drivers/media/pci/solo6x10/Kconfig
-##
-CONFIG_VIDEO_SOLO6X10=m
-
 ##
 ## file: drivers/media/platform/Kconfig
 ##
@@ -763,11 +758,6 @@ CONFIG_DVB_AS102=m
 ##
 # CONFIG_VIDEO_GO7007 is not set
 
-##
-## file: drivers/media/usb/msi2500/Kconfig
-##
-CONFIG_USB_MSI2500=m
-
 ##
 ## file: drivers/media/usb/tm6000/Kconfig
 ##