From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 24 Jun 2013 22:06:42 +0000 (-0700)
Subject: 3.0-stable patches
X-Git-Tag: v3.0.84~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=515d4f4318eb28667a8c40523f0edd583be67d92;p=thirdparty%2Fkernel%2Fstable-queue.git

3.0-stable patches

added patches:
	input-add-missing-dependencies-on-config_has_iomem.patch
	usb-serial-ti_usb_3410_5052-new-device-id-for-abbot-strip-port-cable.patch
---

diff --git a/queue-3.0/input-add-missing-dependencies-on-config_has_iomem.patch b/queue-3.0/input-add-missing-dependencies-on-config_has_iomem.patch
new file mode 100644
index 00000000000..653a28be069
--- /dev/null
+++ b/queue-3.0/input-add-missing-dependencies-on-config_has_iomem.patch
@@ -0,0 +1,41 @@
+From 150e5928d6063b273a80d9d6722417ac3c93ff82 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Mon, 10 Jun 2013 11:05:40 -0700
+Subject: Input: add missing dependencies on CONFIG_HAS_IOMEM
+
+From: Ben Hutchings <ben@decadent.org.uk>
+
+commit 150e5928d6063b273a80d9d6722417ac3c93ff82 upstream.
+
+Several drivers don't build on s390 with CONFIG_PCI disabled as
+they require MMIO functions.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/input/keyboard/Kconfig |    1 +
+ drivers/input/serio/Kconfig    |    1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/drivers/input/keyboard/Kconfig
++++ b/drivers/input/keyboard/Kconfig
+@@ -387,6 +387,7 @@ config KEYBOARD_TEGRA
+ 
+ config KEYBOARD_OPENCORES
+ 	tristate "OpenCores Keyboard Controller"
++	depends on HAS_IOMEM
+ 	help
+ 	  Say Y here if you want to use the OpenCores Keyboard Controller
+ 	  http://www.opencores.org/project,keyboardcontroller
+--- a/drivers/input/serio/Kconfig
++++ b/drivers/input/serio/Kconfig
+@@ -204,6 +204,7 @@ config SERIO_XILINX_XPS_PS2
+ 
+ config SERIO_ALTERA_PS2
+ 	tristate "Altera UP PS/2 controller"
++	depends on HAS_IOMEM
+ 	help
+ 	  Say Y here if you have Altera University Program PS/2 ports.
+ 
diff --git a/queue-3.0/series b/queue-3.0/series
index 170de9620ec..73d12a3f211 100644
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -14,3 +14,5 @@ net-sctp-fix-null-pointer-dereference-in-socket-destruction.patch
 packet-packet_getname_spkt-make-sure-string-is-always-0-terminated.patch
 l2tp-fix-ppp-header-erasure-and-memory-leak.patch
 l2tp-fix-sendmsg-return-value.patch
+input-add-missing-dependencies-on-config_has_iomem.patch
+usb-serial-ti_usb_3410_5052-new-device-id-for-abbot-strip-port-cable.patch
diff --git a/queue-3.0/usb-serial-ti_usb_3410_5052-new-device-id-for-abbot-strip-port-cable.patch b/queue-3.0/usb-serial-ti_usb_3410_5052-new-device-id-for-abbot-strip-port-cable.patch
new file mode 100644
index 00000000000..47569c0220e
--- /dev/null
+++ b/queue-3.0/usb-serial-ti_usb_3410_5052-new-device-id-for-abbot-strip-port-cable.patch
@@ -0,0 +1,45 @@
+From 35a2fbc941accd0e9f1bfadd669311786118d874 Mon Sep 17 00:00:00 2001
+From: Anders Hammarquist <iko@iko.pp.se>
+Date: Wed, 19 Jun 2013 01:45:48 +0200
+Subject: USB: serial: ti_usb_3410_5052: new device id for Abbot strip port cable
+
+From: Anders Hammarquist <iko@iko.pp.se>
+
+commit 35a2fbc941accd0e9f1bfadd669311786118d874 upstream.
+
+Add product id for Abbott strip port cable for Precision meter which
+uses the TI 3410 chip.
+
+Signed-off-by: Anders Hammarquist <iko@iko.pp.se>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/ti_usb_3410_5052.c |    3 ++-
+ drivers/usb/serial/ti_usb_3410_5052.h |    4 +++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+--- a/drivers/usb/serial/ti_usb_3410_5052.c
++++ b/drivers/usb/serial/ti_usb_3410_5052.c
+@@ -179,7 +179,8 @@ static struct usb_device_id ti_id_table_
+ 	{ USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
+ 	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
+ 	{ USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
+-	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) },
++	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STEREO_PLUG_ID) },
++	{ USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_ID) },
+ 	{ USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },
+ };
+ 
+--- a/drivers/usb/serial/ti_usb_3410_5052.h
++++ b/drivers/usb/serial/ti_usb_3410_5052.h
+@@ -52,7 +52,9 @@
+ 
+ /* Abbott Diabetics vendor and product ids */
+ #define ABBOTT_VENDOR_ID		0x1a61
+-#define ABBOTT_PRODUCT_ID		0x3410
++#define ABBOTT_STEREO_PLUG_ID		0x3410
++#define ABBOTT_PRODUCT_ID		ABBOTT_STEREO_PLUG_ID
++#define ABBOTT_STRIP_PORT_ID		0x3420
+ 
+ /* Commands */
+ #define TI_GET_VERSION			0x01