[kernel] r22569 - in dists/trunk/linux/debian: . config config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Sun May 10 02:14:56 2015
New Revision: 22569

Log:
sound: Enable SND_USB_LINE6, replacing LINE6_USB

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/config
   dists/trunk/linux/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun May 10 02:12:22 2015	(r22568)
+++ dists/trunk/linux/debian/changelog	Sun May 10 02:14:56 2015	(r22569)
@@ -237,6 +237,7 @@
   * HID: Enable HID_USB_WACOM, replacing HID_WACOM
   * [x86] thermal: Enable INT340X_THERMAL, replacing ACPI_INT3403_THERMAL
   * [x86] Re-enable IOSF_MBI and INTEL_RAPL
+  * sound: Enable SND_USB_LINE6, replacing LINE6_USB
 
   [ Ian Campbell ]
   * [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364)

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Sun May 10 02:12:22 2015	(r22568)
+++ dists/trunk/linux/debian/config/config	Sun May 10 02:14:56 2015	(r22569)
@@ -6369,6 +6369,11 @@
 CONFIG_SND_BCD2000=m
 
 ##
+## file: sound/usb/line6/Kconfig
+##
+CONFIG_SND_USB_LINE6=m
+
+##
 ## file: usr/Kconfig
 ##
 CONFIG_INITRAMFS_SOURCE=""

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Sun May 10 02:12:22 2015	(r22568)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Sun May 10 02:14:56 2015	(r22569)
@@ -1437,12 +1437,6 @@
 CONFIG_TSL2583=m
 
 ##
-## file: drivers/staging/line6/Kconfig
-##
-CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
-
-##
 ## file: drivers/staging/lustre/lnet/Kconfig
 ##
 CONFIG_LNET=m