diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-09-23 19:15:44 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-09-23 19:15:44 -0400 |
commit | 291852e8791a596195edc3ced96481bfd105f35b (patch) | |
tree | 5ac0d7f65cc21943863301fc50e62a616b168e8d /arch/m68k/emu/nfcon.c | |
parent | 2910f14584eddf2bc0db4baec3c6950ef357b52c (diff) | |
parent | de6ca33a96a6bf61fcb91d3d399703e19ead9d1e (diff) |
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/m68k/emu/nfcon.c')
-rw-r--r-- | arch/m68k/emu/nfcon.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/emu/nfcon.c b/arch/m68k/emu/nfcon.c index 8db25e80694..16d170f53bf 100644 --- a/arch/m68k/emu/nfcon.c +++ b/arch/m68k/emu/nfcon.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <asm/natfeat.h> | 19 | #include <asm/natfeat.h> |
20 | 20 | ||
21 | static int stderr_id; | 21 | static int stderr_id; |
22 | static struct tty_port nfcon_tty_port; | ||
22 | static struct tty_driver *nfcon_tty_driver; | 23 | static struct tty_driver *nfcon_tty_driver; |
23 | 24 | ||
24 | static void nfputs(const char *str, unsigned int count) | 25 | static void nfputs(const char *str, unsigned int count) |
@@ -119,6 +120,8 @@ static int __init nfcon_init(void) | |||
119 | { | 120 | { |
120 | int res; | 121 | int res; |
121 | 122 | ||
123 | tty_port_init(&nfcon_tty_port); | ||
124 | |||
122 | stderr_id = nf_get_id("NF_STDERR"); | 125 | stderr_id = nf_get_id("NF_STDERR"); |
123 | if (!stderr_id) | 126 | if (!stderr_id) |
124 | return -ENODEV; | 127 | return -ENODEV; |
@@ -135,6 +138,7 @@ static int __init nfcon_init(void) | |||
135 | nfcon_tty_driver->flags = TTY_DRIVER_REAL_RAW; | 138 | nfcon_tty_driver->flags = TTY_DRIVER_REAL_RAW; |
136 | 139 | ||
137 | tty_set_operations(nfcon_tty_driver, &nfcon_tty_ops); | 140 | tty_set_operations(nfcon_tty_driver, &nfcon_tty_ops); |
141 | tty_port_link_device(&nfcon_tty_port, nfcon_tty_driver, 0); | ||
138 | res = tty_register_driver(nfcon_tty_driver); | 142 | res = tty_register_driver(nfcon_tty_driver); |
139 | if (res) { | 143 | if (res) { |
140 | pr_err("failed to register nfcon tty driver\n"); | 144 | pr_err("failed to register nfcon tty driver\n"); |