diff options
| author | Ingo Molnar | 2008-06-16 11:20:37 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-06-16 11:20:37 +0200 |
| commit | 3557b18fcbe0e29706214f3c7cc680a7823605eb (patch) | |
| tree | 2a70696b78a9e8b5ba38090901301931d395ecfb /drivers/serial/sb1250-duart.c | |
| parent | x86: use pteval_t for _PAGE_FOO (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | kernel-qcow2-linux-3557b18fcbe0e29706214f3c7cc680a7823605eb.tar.gz kernel-qcow2-linux-3557b18fcbe0e29706214f3c7cc680a7823605eb.tar.xz kernel-qcow2-linux-3557b18fcbe0e29706214f3c7cc680a7823605eb.zip | |
Merge branch 'linus' into x86/ptemask
Diffstat (limited to 'drivers/serial/sb1250-duart.c')
| -rw-r--r-- | drivers/serial/sb1250-duart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sb1250-duart.c b/drivers/serial/sb1250-duart.c index 2d6c08b3dbcf..f8e1447a022a 100644 --- a/drivers/serial/sb1250-duart.c +++ b/drivers/serial/sb1250-duart.c @@ -924,7 +924,7 @@ console_initcall(sbd_serial_console_init); static struct uart_driver sbd_reg = { .owner = THIS_MODULE, - .driver_name = "serial", + .driver_name = "sb1250_duart", .dev_name = "duart", .major = TTY_MAJOR, .minor = SB1250_DUART_MINOR_BASE, |