From: Greg Kroah-Hartman Date: Mon, 24 Jun 2013 22:53:56 +0000 (-0700) Subject: remove unneeded patch from 3.0 and 3.4 X-Git-Tag: v3.0.84~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93a6772be3a50401100c51c5976729015fa6f1bd;p=thirdparty%2Fkernel%2Fstable-queue.git remove unneeded patch from 3.0 and 3.4 --- 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 deleted file mode 100644 index 653a28be069..00000000000 --- a/queue-3.0/input-add-missing-dependencies-on-config_has_iomem.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 150e5928d6063b273a80d9d6722417ac3c93ff82 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings -Date: Mon, 10 Jun 2013 11:05:40 -0700 -Subject: Input: add missing dependencies on CONFIG_HAS_IOMEM - -From: Ben Hutchings - -commit 150e5928d6063b273a80d9d6722417ac3c93ff82 upstream. - -Several drivers don't build on s390 with CONFIG_PCI disabled as -they require MMIO functions. - -Signed-off-by: Ben Hutchings -Signed-off-by: Dmitry Torokhov -Signed-off-by: Greg Kroah-Hartman - ---- - 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 73d12a3f211..b938d711fe8 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -14,5 +14,4 @@ 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.4/input-add-missing-dependencies-on-config_has_iomem.patch b/queue-3.4/input-add-missing-dependencies-on-config_has_iomem.patch deleted file mode 100644 index 4a09a63f94e..00000000000 --- a/queue-3.4/input-add-missing-dependencies-on-config_has_iomem.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 150e5928d6063b273a80d9d6722417ac3c93ff82 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings -Date: Mon, 10 Jun 2013 11:05:40 -0700 -Subject: Input: add missing dependencies on CONFIG_HAS_IOMEM - -From: Ben Hutchings - -commit 150e5928d6063b273a80d9d6722417ac3c93ff82 upstream. - -Several drivers don't build on s390 with CONFIG_PCI disabled as -they require MMIO functions. - -Signed-off-by: Ben Hutchings -Signed-off-by: Dmitry Torokhov -Signed-off-by: Greg Kroah-Hartman - ---- - 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 -@@ -404,6 +404,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.4/series b/queue-3.4/series index 76da9b51cb8..181a25da41c 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -22,6 +22,5 @@ l2tp-fix-ppp-header-erasure-and-memory-leak.patch l2tp-fix-sendmsg-return-value.patch bonding-rlb-mode-of-bond-should-not-alter-arp-originating-via-bridge.patch input-cyttsp-fix-memcpy-size-param.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 target-iscsi-don-t-corrupt-bh_count-in-iscsit_stop_time2retain_timer.patch