diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/serial/serial_ks8695.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/serial/serial_ks8695.c')
| -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 = { | |||
| 650 | 650 | ||
| 651 | static int __init ks8695_console_init(void) | 651 | static int __init ks8695_console_init(void) |
| 652 | { | 652 | { |
| 653 | add_preferred_console(SERIAL_KS8695_DEVNAME, 0, NULL); | ||
| 653 | register_console(&ks8695_console); | 654 | register_console(&ks8695_console); |
| 654 | return 0; | 655 | return 0; |
| 655 | } | 656 | } |