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

[Ben Hutchings]

Author: benh
Date: Sun May 10 02:16:15 2015
New Revision: 22570

Log:
media/rc: Enable IR_IGORPLUGUSB, replacing LIRC_IGORPLUGUSB

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:14:56 2015	(r22569)
+++ dists/trunk/linux/debian/changelog	Sun May 10 02:16:15 2015	(r22570)
@@ -238,6 +238,7 @@
   * [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
+  * media/rc: Enable IR_IGORPLUGUSB, replacing LIRC_IGORPLUGUSB
 
   [ 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:14:56 2015	(r22569)
+++ dists/trunk/linux/debian/config/config	Sun May 10 02:16:15 2015	(r22570)
@@ -1802,6 +1802,7 @@
 # CONFIG_IR_NUVOTON is not set
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_STREAMZAP=m
+CONFIG_IR_IGORPLUGUSB=m
 CONFIG_IR_IGUANA=m
 CONFIG_IR_TTUSBIR=m
 CONFIG_RC_LOOPBACK=m

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Sun May 10 02:14:56 2015	(r22569)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Sun May 10 02:16:15 2015	(r22570)
@@ -1467,7 +1467,6 @@
 ##
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IGORPLUGUSB=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m