diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-03 13:05:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-03 13:05:11 -0400 |
commit | bf640be423d60d954b9673527e106a461a129eb8 (patch) | |
tree | 654d168d6effc47d18528ef5770c6f6dea51d901 /drivers/serial/sunzilog.c | |
parent | c36c804559d3a891a2e655ba8185b4fa7eaee156 (diff) | |
parent | 4a1236ac6ee3bb3a2f585e66871de3c39ab38f7c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc32: Delete prom_stdin and prom_stdout.
sparc32: More memory probing consolidation.
sparc32: Kill totally unused memory information tables.
sparc64: Fix syscall restart, for real...
serial: Fix sparc driver name strings.
sparc64: Stop creating dummy root PCI host controller devices.
Diffstat (limited to 'drivers/serial/sunzilog.c')
-rw-r--r-- | drivers/serial/sunzilog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 90a20a152ebf..7e9fa5ef0eb7 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c | |||
@@ -1023,7 +1023,7 @@ static struct uart_sunzilog_port *sunzilog_irq_chain; | |||
1023 | 1023 | ||
1024 | static struct uart_driver sunzilog_reg = { | 1024 | static struct uart_driver sunzilog_reg = { |
1025 | .owner = THIS_MODULE, | 1025 | .owner = THIS_MODULE, |
1026 | .driver_name = "ttyS", | 1026 | .driver_name = "sunzilog", |
1027 | .dev_name = "ttyS", | 1027 | .dev_name = "ttyS", |
1028 | .major = TTY_MAJOR, | 1028 | .major = TTY_MAJOR, |
1029 | }; | 1029 | }; |