[kernel] r18917 - in dists/sid/linux-2.6/debian: . config/armhf config/mips config/mipsel config/s390

[Ben Hutchings]

Author: benh
Date: Sun Apr  8 20:16:29 2012
New Revision: 18917

Log:
[armhf/mx5,mipsel/loongson-2f] input: Enable INPUT_TOUCHSCREEN (Closes: #668036)

While we're at it, explicitly disable it for mips/octeon and s390.
It's still not explicitly enabled or disabled for sh4.

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/armhf/config.mx5
   dists/sid/linux-2.6/debian/config/mips/config.octeon
   dists/sid/linux-2.6/debian/config/mipsel/config.loongson-2f
   dists/sid/linux-2.6/debian/config/s390/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Apr  7 20:42:13 2012	(r18916)
+++ dists/sid/linux-2.6/debian/changelog	Sun Apr  8 20:16:29 2012	(r18917)
@@ -4,6 +4,8 @@
   * net: fix /proc/net/dev regression (Closes: #659499)
   * [armel/orion5x] Fix GPIO enable bits for MPP9 (Closes: #667446)
   * [x86] drm/i915: mask transcoder select bits before setting them on LVDS
+  * [armhf/mx5,mipsel/loongson-2f] input: Enable INPUT_TOUCHSCREEN
+    (Closes: #668036)
 
   [ Jonathan Nieder ]
   * [x86] ioat: fix size of 'completion' for Xen (Closes: #660554)

Modified: dists/sid/linux-2.6/debian/config/armhf/config.mx5
==============================================================================
--- dists/sid/linux-2.6/debian/config/armhf/config.mx5	Sat Apr  7 20:42:13 2012	(r18916)
+++ dists/sid/linux-2.6/debian/config/armhf/config.mx5	Sun Apr  8 20:16:29 2012	(r18917)
@@ -67,6 +67,11 @@
 CONFIG_I2C_IMX=y
 
 ##
+## file: drivers/input/touchscreen/Kconfig
+##
+CONFIG_INPUT_TOUCHSCREEN=y
+
+##
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_LEDS_GPIO=y

Modified: dists/sid/linux-2.6/debian/config/mips/config.octeon
==============================================================================
--- dists/sid/linux-2.6/debian/config/mips/config.octeon	Sat Apr  7 20:42:13 2012	(r18916)
+++ dists/sid/linux-2.6/debian/config/mips/config.octeon	Sun Apr  8 20:16:29 2012	(r18917)
@@ -64,6 +64,11 @@
 CONFIG_MOUSE_PS2=y
 
 ##
+## file: drivers/input/touchscreen/Kconfig
+##
+# CONFIG_INPUT_TOUCHSCREEN is not set
+
+##
 ## file: drivers/message/fusion/Kconfig
 ##
 CONFIG_FUSION=y

Modified: dists/sid/linux-2.6/debian/config/mipsel/config.loongson-2f
==============================================================================
--- dists/sid/linux-2.6/debian/config/mipsel/config.loongson-2f	Sat Apr  7 20:42:13 2012	(r18916)
+++ dists/sid/linux-2.6/debian/config/mipsel/config.loongson-2f	Sun Apr  8 20:16:29 2012	(r18917)
@@ -44,6 +44,11 @@
 ## end choice
 
 ##
+## file: drivers/input/touchscreen/Kconfig
+##
+CONFIG_INPUT_TOUCHSCREEN=y
+
+##
 ## file: drivers/net/ethernet/amd/Kconfig
 ##
 # CONFIG_PCNET32 is not set

Modified: dists/sid/linux-2.6/debian/config/s390/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/s390/config	Sat Apr  7 20:42:13 2012	(r18916)
+++ dists/sid/linux-2.6/debian/config/s390/config	Sun Apr  8 20:16:29 2012	(r18917)
@@ -50,6 +50,11 @@
 CONFIG_S390_PRNG=m
 
 ##
+## file: drivers/input/touchscreen/Kconfig
+##
+# CONFIG_INPUT_TOUCHSCREEN is not set
+
+##
 ## file: drivers/memstick/Kconfig
 ##
 # CONFIG_MEMSTICK is not set