Messages in this thread Patch in this message | | | Subject | [PATCH v2] Stop pmac_zilog from abusing 8250's device numbers. | From | David Woodhouse <> | Date | Tue, 03 Apr 2007 20:01:35 -0400 |
| |
There are proper device numbers registered for pmac_zilog now. Use them, and change the name of the device to 'ttyPZ%d'. This allows the pmac_zilog and 8250 drivers to co-exist in the kernel.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index 752ef07..2ab23af 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c @@ -99,9 +99,10 @@ static DEFINE_MUTEX(pmz_irq_mutex); static struct uart_driver pmz_uart_reg = { .owner = THIS_MODULE, - .driver_name = "ttyS", - .dev_name = "ttyS", - .major = TTY_MAJOR, + .driver_name = "ttyPZ", + .dev_name = "ttyPZ", + .major = 204, + .minor = 192, }; @@ -1776,7 +1777,7 @@ static void pmz_console_write(struct console *con, const char *s, unsigned int c static int __init pmz_console_setup(struct console *co, char *options); static struct console pmz_console = { - .name = "ttyS", + .name = "ttyPZ", .write = pmz_console_write, .device = uart_console_device, .setup = pmz_console_setup, @@ -1800,7 +1801,6 @@ static int __init pmz_register(void) pmz_uart_reg.nr = pmz_ports_count; pmz_uart_reg.cons = PMACZILOG_CONSOLE; - pmz_uart_reg.minor = 64; /* * Register this driver with the serial core -- dwmw2
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |