diff options
| author | Linus Torvalds | 2010-04-30 02:17:35 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-04-30 02:17:35 +0200 |
| commit | 6bec11921a7d7b11d0b1909596636632aece5a26 (patch) | |
| tree | 1bf2ac7d5c482afb2c5cf59c0fc7db7c7ac03ff6 /drivers/serial | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is n... (diff) | |
| download | kernel-qcow2-linux-6bec11921a7d7b11d0b1909596636632aece5a26.tar.gz kernel-qcow2-linux-6bec11921a7d7b11d0b1909596636632aece5a26.tar.xz kernel-qcow2-linux-6bec11921a7d7b11d0b1909596636632aece5a26.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is not working.
ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB
ARM: 6030/1: KS8695: enable console
ARM: 6060/1: PL061 GPIO: Setting gpio val after changing direction to OUT.
ARM: 6059/1: PL061 GPIO: Changing *_irq_chip_data with *_irq_data for real irqs.
ARM: 6023/1: update bcmring_defconfig to latest version and fix build error
ARM: fix build error in arch/arm/kernel/process.c
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_ks8695.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/serial_ks8695.c b/drivers/serial/serial_ks8695.c index 2e71bbc04dac..b1962025b1aa 100644 --- a/drivers/serial/serial_ks8695.c +++ b/drivers/serial/serial_ks8695.c @@ -650,6 +650,7 @@ static struct console ks8695_console = { static int __init ks8695_console_init(void) { + add_preferred_console(SERIAL_KS8695_DEVNAME, 0, NULL); register_console(&ks8695_console); return 0; } |