projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| d53dcc05 GKH |
1 | From f2eb3cdf14457fccb14ae8c4d7d7cee088cd3957 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ralf Baechle <ralf@linux-mips.org> | |
| 3 | Date: Mon, 27 Jun 2011 14:26:56 +0100 | |
| 4 | Subject: SERIAL: SC26xx: Fix link error. | |
| 5 | ||
| 6 | From: Ralf Baechle <ralf@linux-mips.org> | |
| 7 | ||
| 8 | commit f2eb3cdf14457fccb14ae8c4d7d7cee088cd3957 upstream. | |
| 9 | ||
| 10 | Kconfig allows enabling console support for the SC26xx driver even when | |
| 11 | it's configured as a module resulting in a: | |
| 12 | ||
| 13 | ERROR: "uart_console_device" [drivers/tty/serial/sc26xx.ko] undefined! | |
| 14 | ||
| 15 | modpost error since the driver was merged in | |
| 16 | eea63e0e8a60d00485b47fb6e75d9aa2566b989b [SC26XX: New serial driver for | |
| 17 | SC2681 uarts] in 2.6.25. Fixed by only allowing console support to be | |
| 18 | enabled if the driver is builtin. | |
| 19 | ||
| 20 | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | |
| 21 | Cc: linux-serial@vger.kernel.org | |
| 22 | Cc: linux-kernel@vger.kernel.org | |
| 23 | Cc: linux-mips@linux-mips.org | |
| 24 | Acked-by: Alan Cox <alan@linux.intel.com> | |
| 25 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 26 | ||
| 27 | --- | |
| 28 | drivers/tty/serial/Kconfig | 2 +- | |
| 29 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 30 | ||
| 31 | --- a/drivers/tty/serial/Kconfig | |
| 32 | +++ b/drivers/tty/serial/Kconfig | |
| 33 | @@ -1419,7 +1419,7 @@ config SERIAL_SC26XX | |
| 34 | ||
| 35 | config SERIAL_SC26XX_CONSOLE | |
| 36 | bool "Console on SC2681/SC2692 serial port" | |
| 37 | - depends on SERIAL_SC26XX | |
| 38 | + depends on SERIAL_SC26XX=y | |
| 39 | select SERIAL_CORE_CONSOLE | |
| 40 | help | |
| 41 | Support for Console on SC2681/SC2692 serial ports. |