]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
SERIAL: SC26xx: Fix link error.
authorRalf Baechle <ralf@linux-mips.org>
Mon, 27 Jun 2011 13:26:56 +0000 (14:26 +0100)
committerAndi Kleen <ak@linux.intel.com>
Mon, 1 Aug 2011 20:55:04 +0000 (13:55 -0700)
[ upstream commit f2eb3cdf14457fccb14ae8c4d7d7cee088cd3957 ]

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
Cc: stable <stable@kernel.org>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
drivers/serial/Kconfig

index 8b23165bc5dc63dc4ff35728cf93d104f513326f..1356eab002b6f5663757a5daa34da935fb87610e 100644 (file)
@@ -1417,7 +1417,7 @@ config SERIAL_SC26XX
 
 config SERIAL_SC26XX_CONSOLE
        bool "Console on SC2681/SC2692 serial port"
-       depends on SERIAL_SC26XX
+       depends on SERIAL_SC26XX=y
        select SERIAL_CORE_CONSOLE
        help
          Support for Console on SC2681/SC2692 serial ports.