diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:14:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:14:47 -0400 |
| commit | babf68de5848f7e4b97c9c4a2d5e30598b825387 (patch) | |
| tree | 9e5bb2d6eedc8fb91d81cd34c74f361a4ad81241 /drivers/char | |
| parent | e766f1cc596078b1603ac2c96617660c4c7e2d81 (diff) | |
| parent | 9b4e3b13b147e9b737de63188a9ae740eaa8c36d (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/moxa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 95f7046ff05..79e490ef2cf 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c | |||
| @@ -339,7 +339,7 @@ static int __init moxa_init(void) | |||
| 339 | 339 | ||
| 340 | init_MUTEX(&moxaBuffSem); | 340 | init_MUTEX(&moxaBuffSem); |
| 341 | moxaDriver->owner = THIS_MODULE; | 341 | moxaDriver->owner = THIS_MODULE; |
| 342 | moxaDriver->name = "ttya"; | 342 | moxaDriver->name = "ttyMX"; |
| 343 | moxaDriver->devfs_name = "tts/a"; | 343 | moxaDriver->devfs_name = "tts/a"; |
| 344 | moxaDriver->major = ttymajor; | 344 | moxaDriver->major = ttymajor; |
| 345 | moxaDriver->minor_start = 0; | 345 | moxaDriver->minor_start = 0; |