diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-03 10:05:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-03 10:05:11 -0700 |
| commit | bf640be423d60d954b9673527e106a461a129eb8 (patch) | |
| tree | 654d168d6effc47d18528ef5770c6f6dea51d901 /drivers | |
| parent | c36c804559d3a891a2e655ba8185b4fa7eaee156 (diff) | |
| parent | 4a1236ac6ee3bb3a2f585e66871de3c39ab38f7c (diff) | |
| download | linux-bf640be423d60d954b9673527e106a461a129eb8.tar.gz linux-bf640be423d60d954b9673527e106a461a129eb8.tar.bz2 linux-bf640be423d60d954b9673527e106a461a129eb8.zip | |
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')
| -rw-r--r-- | drivers/serial/sunhv.c | 2 | ||||
| -rw-r--r-- | drivers/serial/sunsab.c | 2 | ||||
| -rw-r--r-- | drivers/serial/sunsu.c | 2 | ||||
| -rw-r--r-- | drivers/serial/sunzilog.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c index be0fe152891b..145c0281495d 100644 --- a/drivers/serial/sunhv.c +++ b/drivers/serial/sunhv.c @@ -392,7 +392,7 @@ static struct uart_ops sunhv_pops = { static struct uart_driver sunhv_reg = { .owner = THIS_MODULE, - .driver_name = "serial", + .driver_name = "sunhv", .dev_name = "ttyS", .major = TTY_MAJOR, }; diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index 543f93741e6f..9ff5b38f3bee 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c @@ -826,7 +826,7 @@ static struct uart_ops sunsab_pops = { static struct uart_driver sunsab_reg = { .owner = THIS_MODULE, - .driver_name = "serial", + .driver_name = "sunsab", .dev_name = "ttyS", .major = TTY_MAJOR, }; diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 4e2302d43ab1..03806a935209 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c @@ -1173,7 +1173,7 @@ out: static struct uart_driver sunsu_reg = { .owner = THIS_MODULE, - .driver_name = "serial", + .driver_name = "sunsu", .dev_name = "ttyS", .major = TTY_MAJOR, }; 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; static struct uart_driver sunzilog_reg = { .owner = THIS_MODULE, - .driver_name = "ttyS", + .driver_name = "sunzilog", .dev_name = "ttyS", .major = TTY_MAJOR, }; |