]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.13-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Feb 2014 17:06:50 +0000 (09:06 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Feb 2014 17:06:50 +0000 (09:06 -0800)
added patches:
drivers-tty-ehv_bytechan-fails-to-build-as-a-module.patch

queue-3.13/drivers-tty-ehv_bytechan-fails-to-build-as-a-module.patch [new file with mode: 0644]
queue-3.13/series

diff --git a/queue-3.13/drivers-tty-ehv_bytechan-fails-to-build-as-a-module.patch b/queue-3.13/drivers-tty-ehv_bytechan-fails-to-build-as-a-module.patch
new file mode 100644 (file)
index 0000000..b55c05a
--- /dev/null
@@ -0,0 +1,37 @@
+From a183d3ae63c08186477d2b0ef2798d47d10add4b Mon Sep 17 00:00:00 2001
+From: Anton Blanchard <anton@samba.org>
+Date: Mon, 9 Dec 2013 16:03:10 +1100
+Subject: drivers/tty: ehv_bytechan fails to build as a module
+
+From: Anton Blanchard <anton@samba.org>
+
+commit a183d3ae63c08186477d2b0ef2798d47d10add4b upstream.
+
+ehv_bytechan is marked tristate but fails to build as a module:
+
+drivers/tty/ehv_bytechan.c:363:1: error: type defaults to ‘int’ in declaration of ‘console_initcall’ [-Werror=implicit-int]
+
+It doesn't make much sense for a console driver to be built as
+a module, so change it to a bool.
+
+Signed-off-by: Anton Blanchard <anton@samba.org>
+Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Scott Wood <scottwood@freescale.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/tty/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/tty/Kconfig
++++ b/drivers/tty/Kconfig
+@@ -366,7 +366,7 @@ config TRACE_SINK
+         "Trace data router for MIPI P1149.7 cJTAG standard".
+ config PPC_EPAPR_HV_BYTECHAN
+-      tristate "ePAPR hypervisor byte channel driver"
++      bool "ePAPR hypervisor byte channel driver"
+       depends on PPC
+       select EPAPR_PARAVIRT
+       help
index 83b0d29ead1b42ea22b1381720c0f730c1df889a..30dce047bab6c5718459d6937b4416f365dc8516 100644 (file)
@@ -109,3 +109,4 @@ arm-mvebu-add-quirk-for-i2c-for-the-openblocks-ax3-4-board.patch
 i2c-mv64xxx-fix-bus-hang-on-a0-version-of-the-armada-xp-socs.patch
 i2c-mv64xxx-document-the-newly-introduced-armada-xp-a0-compatible.patch
 i2c-piix4-add-support-for-amd-ml-and-cz-smbus-changes.patch
+drivers-tty-ehv_bytechan-fails-to-build-as-a-module.patch