From: Greg Kroah-Hartman Date: Tue, 4 Feb 2014 17:06:50 +0000 (-0800) Subject: 3.13-stable patches X-Git-Tag: v3.4.79~1^2~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=caab5105a3f0a6d4af64e8f5d7eb8036c0e05e82;p=thirdparty%2Fkernel%2Fstable-queue.git 3.13-stable patches added patches: drivers-tty-ehv_bytechan-fails-to-build-as-a-module.patch --- 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 index 00000000000..b55c05a0860 --- /dev/null +++ b/queue-3.13/drivers-tty-ehv_bytechan-fails-to-build-as-a-module.patch @@ -0,0 +1,37 @@ +From a183d3ae63c08186477d2b0ef2798d47d10add4b Mon Sep 17 00:00:00 2001 +From: Anton Blanchard +Date: Mon, 9 Dec 2013 16:03:10 +1100 +Subject: drivers/tty: ehv_bytechan fails to build as a module + +From: Anton Blanchard + +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 +Acked-by: Greg Kroah-Hartman +Signed-off-by: Scott Wood +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + 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 diff --git a/queue-3.13/series b/queue-3.13/series index 83b0d29ead1..30dce047bab 100644 --- a/queue-3.13/series +++ b/queue-3.13/series @@ -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