summaryrefslogtreecommitdiffstats
path: root/drivers/serial/sb1250-duart.c
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2008-07-11 15:36:25 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2008-07-11 15:36:25 +0200
commita8931ef380c92d121ae74ecfb03b2d63f72eea6f (patch)
tree980fb6b019e11e6cb1ece55b7faff184721a8053 /drivers/serial/sb1250-duart.c
parent[MTD] [NAND] Fix checkpatch warnings which showed up when atmel_nand.c moved (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-a8931ef380c92d121ae74ecfb03b2d63f72eea6f.tar.xz
linux-a8931ef380c92d121ae74ecfb03b2d63f72eea6f.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/serial/sb1250-duart.c')
-rw-r--r--drivers/serial/sb1250-duart.c2
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,