Commit 0d28ed33 authored by David S. Miller's avatar David S. Miller

Merge bk://kernel.bkbits.net/acme/sparc-2.5

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5
parents a6ab62b1 4fe00074
...@@ -1030,7 +1030,7 @@ static struct uart_driver sunzilog_reg = { ...@@ -1030,7 +1030,7 @@ static struct uart_driver sunzilog_reg = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.driver_name = "ttyS", .driver_name = "ttyS",
#ifdef CONFIG_DEVFS_FS #ifdef CONFIG_DEVFS_FS
.dev_name = "ttyS%d", .dev_name = "tts/%d",
#else #else
.dev_name = "ttyS%d", .dev_name = "ttyS%d",
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment