From d3ef140f474ed698ccd668dab34de437604970be Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sun, 8 Apr 2012 20:16:29 +0000
Subject: [PATCH] [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.

svn path=/dists/sid/linux-2.6/; revision=18917
---
 debian/changelog                        | 2 ++
 debian/config/armhf/config.mx5          | 5 +++++
 debian/config/mips/config.octeon        | 5 +++++
 debian/config/mipsel/config.loongson-2f | 5 +++++
 debian/config/s390/config               | 5 +++++
 5 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 979364974..6ae12bb82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ linux-2.6 (3.2.14-2) UNRELEASED; urgency=low
   * 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)
diff --git a/debian/config/armhf/config.mx5 b/debian/config/armhf/config.mx5
index 21a0163e6..176fedcac 100644
--- a/debian/config/armhf/config.mx5
+++ b/debian/config/armhf/config.mx5
@@ -66,6 +66,11 @@ CONFIG_USB_HID=y
 ##
 CONFIG_I2C_IMX=y
 
+##
+## file: drivers/input/touchscreen/Kconfig
+##
+CONFIG_INPUT_TOUCHSCREEN=y
+
 ##
 ## file: drivers/leds/Kconfig
 ##
diff --git a/debian/config/mips/config.octeon b/debian/config/mips/config.octeon
index 331a13828..5395d1bb0 100644
--- a/debian/config/mips/config.octeon
+++ b/debian/config/mips/config.octeon
@@ -63,6 +63,11 @@ CONFIG_KEYBOARD_ATKBD=y
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
 
+##
+## file: drivers/input/touchscreen/Kconfig
+##
+# CONFIG_INPUT_TOUCHSCREEN is not set
+
 ##
 ## file: drivers/message/fusion/Kconfig
 ##
diff --git a/debian/config/mipsel/config.loongson-2f b/debian/config/mipsel/config.loongson-2f
index a10147653..72f280edb 100644
--- a/debian/config/mipsel/config.loongson-2f
+++ b/debian/config/mipsel/config.loongson-2f
@@ -43,6 +43,11 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 ## end choice
 
+##
+## file: drivers/input/touchscreen/Kconfig
+##
+CONFIG_INPUT_TOUCHSCREEN=y
+
 ##
 ## file: drivers/net/ethernet/amd/Kconfig
 ##
diff --git a/debian/config/s390/config b/debian/config/s390/config
index 450131ad6..089f27f1c 100644
--- a/debian/config/s390/config
+++ b/debian/config/s390/config
@@ -49,6 +49,11 @@ CONFIG_CRYPTO_DES_S390=m
 CONFIG_CRYPTO_AES_S390=m
 CONFIG_S390_PRNG=m
 
+##
+## file: drivers/input/touchscreen/Kconfig
+##
+# CONFIG_INPUT_TOUCHSCREEN is not set
+
 ##
 ## file: drivers/memstick/Kconfig
 ##