diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /arch/m68k/emu/nfcon.c | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/emu/nfcon.c')
| -rw-r--r-- | arch/m68k/emu/nfcon.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/emu/nfcon.c b/arch/m68k/emu/nfcon.c index ab20dc0ff63b..8db25e806947 100644 --- a/arch/m68k/emu/nfcon.c +++ b/arch/m68k/emu/nfcon.c | |||
| @@ -127,7 +127,6 @@ static int __init nfcon_init(void) | |||
| 127 | if (!nfcon_tty_driver) | 127 | if (!nfcon_tty_driver) |
| 128 | return -ENOMEM; | 128 | return -ENOMEM; |
| 129 | 129 | ||
| 130 | nfcon_tty_driver->owner = THIS_MODULE; | ||
| 131 | nfcon_tty_driver->driver_name = "nfcon"; | 130 | nfcon_tty_driver->driver_name = "nfcon"; |
| 132 | nfcon_tty_driver->name = "nfcon"; | 131 | nfcon_tty_driver->name = "nfcon"; |
| 133 | nfcon_tty_driver->type = TTY_DRIVER_TYPE_SYSTEM; | 132 | nfcon_tty_driver->type = TTY_DRIVER_TYPE_SYSTEM; |