summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 11:14:47 +0400
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 11:14:47 +0400
commitbabf68de5848f7e4b97c9c4a2d5e30598b825387 (patch)
tree9e5bb2d6eedc8fb91d81cd34c74f361a4ad81241 /drivers/char
parente766f1cc596078b1603ac2c96617660c4c7e2d81 (diff)
parent9b4e3b13b147e9b737de63188a9ae740eaa8c36d (diff)
downloadlinux-babf68de5848f7e4b97c9c4a2d5e30598b825387.tar.xz
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/moxa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 95f7046ff059..79e490ef2cf2 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -339,7 +339,7 @@ static int __init moxa_init(void)
init_MUTEX(&moxaBuffSem);
moxaDriver->owner = THIS_MODULE;
- moxaDriver->name = "ttya";
+ moxaDriver->name = "ttyMX";
moxaDriver->devfs_name = "tts/a";
moxaDriver->major = ttymajor;
moxaDriver->minor_start = 0;