diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2011-06-27 09:26:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-05 00:58:41 -0400 |
| commit | 86c361cdb455adea881fe00ee055e8290283d47c (patch) | |
| tree | 5087c8675bb6cf6af7a5eb134a5318ce103f90ca /drivers/tty/serial | |
| parent | c4b9902f84ef10b3b1441eacb19c201211aa4307 (diff) | |
SERIAL: SC26xx: Fix link error.
commit f2eb3cdf14457fccb14ae8c4d7d7cee088cd3957 upstream.
Kconfig allows enabling console support for the SC26xx driver even when
it's configured as a module resulting in a:
ERROR: "uart_console_device" [drivers/tty/serial/sc26xx.ko] undefined!
modpost error since the driver was merged in
eea63e0e8a60d00485b47fb6e75d9aa2566b989b [SC26XX: New serial driver for
SC2681 uarts] in 2.6.25. Fixed by only allowing console support to be
enabled if the driver is builtin.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-mips@linux-mips.org
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 636144cea93..b3692e6e3c1 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig | |||
| @@ -1419,7 +1419,7 @@ config SERIAL_SC26XX | |||
| 1419 | 1419 | ||
| 1420 | config SERIAL_SC26XX_CONSOLE | 1420 | config SERIAL_SC26XX_CONSOLE |
| 1421 | bool "Console on SC2681/SC2692 serial port" | 1421 | bool "Console on SC2681/SC2692 serial port" |
| 1422 | depends on SERIAL_SC26XX | 1422 | depends on SERIAL_SC26XX=y |
| 1423 | select SERIAL_CORE_CONSOLE | 1423 | select SERIAL_CORE_CONSOLE |
| 1424 | help | 1424 | help |
| 1425 | Support for Console on SC2681/SC2692 serial ports. | 1425 | Support for Console on SC2681/SC2692 serial ports. |