summaryrefslogtreecommitdiffstats
path: root/arch/parisc
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-09-24 01:15:44 +0200
committerPaul Walmsley <paul@pwsan.com>2012-09-24 01:15:44 +0200
commit291852e8791a596195edc3ced96481bfd105f35b (patch)
tree5ac0d7f65cc21943863301fc50e62a616b168e8d /arch/parisc
parentMerge tag 'omap-cleanup-b-for-3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7 (diff)
parentARM: OMAP1: Include gpio-omap.h for board-h2 and board-h3 (diff)
downloadlinux-291852e8791a596195edc3ced96481bfd105f35b.tar.xz
linux-291852e8791a596195edc3ced96481bfd105f35b.zip
Merge tag 'cleanup-fixes-for-v3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7
These fixes are needed to fix non-omap build breakage for twl-core driver and to fix omap1_defconfig compile when led driver changes and omap sparse IRQ changes are merged together. Also fix warnings for omaps not using pinctrl framework yet.
Diffstat (limited to 'arch/parisc')
-rw-r--r--arch/parisc/kernel/pdc_cons.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c
index 47341aa208f2..88238638aee6 100644
--- a/arch/parisc/kernel/pdc_cons.c
+++ b/arch/parisc/kernel/pdc_cons.c
@@ -202,6 +202,7 @@ static int __init pdc_console_tty_driver_init(void)
pdc_console_tty_driver->flags = TTY_DRIVER_REAL_RAW |
TTY_DRIVER_RESET_TERMIOS;
tty_set_operations(pdc_console_tty_driver, &pdc_console_tty_ops);
+ tty_port_link_device(&tty_port, pdc_console_tty_driver, 0);
err = tty_register_driver(pdc_console_tty_driver);
if (err) {