diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2007-05-08 03:30:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:12 -0400 |
commit | 07bafde351470e19168dfc6385ff417e832850c1 (patch) | |
tree | bb55f7a74bdf0bcc24c958f6367b2c4a4d642444 | |
parent | 7f76c403751ab917b2ebed5663079a6b2956eebd (diff) |
serial_txx9: Use assigned device numbers
The serial_txx9 driver have abused device numbers (major 4, minor 128) if
CONFIG_SERIAL_TXX9_STDSERIAL was not set. This patch makes the driver use
proper device numbers assigned for it (major 204, minor 196-203). I
suppose a typical user of this driver set CONFIG_SERIAL_TXX9_STDSERIAL to Y
(i.e. use "ttyS0"), so this patch would not cause big compatibility issue.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/serial/serial_txx9.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c index 509ace7e6881..98dcea73b298 100644 --- a/drivers/serial/serial_txx9.c +++ b/drivers/serial/serial_txx9.c | |||
@@ -62,7 +62,7 @@ | |||
62 | 62 | ||
63 | #include <asm/io.h> | 63 | #include <asm/io.h> |
64 | 64 | ||
65 | static char *serial_version = "1.08"; | 65 | static char *serial_version = "1.09"; |
66 | static char *serial_name = "TX39/49 Serial driver"; | 66 | static char *serial_name = "TX39/49 Serial driver"; |
67 | 67 | ||
68 | #define PASS_LIMIT 256 | 68 | #define PASS_LIMIT 256 |
@@ -70,13 +70,14 @@ static char *serial_name = "TX39/49 Serial driver"; | |||
70 | #if !defined(CONFIG_SERIAL_TXX9_STDSERIAL) | 70 | #if !defined(CONFIG_SERIAL_TXX9_STDSERIAL) |
71 | /* "ttyS" is used for standard serial driver */ | 71 | /* "ttyS" is used for standard serial driver */ |
72 | #define TXX9_TTY_NAME "ttyTX" | 72 | #define TXX9_TTY_NAME "ttyTX" |
73 | #define TXX9_TTY_MINOR_START (64 + 64) /* ttyTX0(128), ttyTX1(129) */ | 73 | #define TXX9_TTY_MINOR_START 196 |
74 | #define TXX9_TTY_MAJOR 204 | ||
74 | #else | 75 | #else |
75 | /* acts like standard serial driver */ | 76 | /* acts like standard serial driver */ |
76 | #define TXX9_TTY_NAME "ttyS" | 77 | #define TXX9_TTY_NAME "ttyS" |
77 | #define TXX9_TTY_MINOR_START 64 | 78 | #define TXX9_TTY_MINOR_START 64 |
78 | #endif | ||
79 | #define TXX9_TTY_MAJOR TTY_MAJOR | 79 | #define TXX9_TTY_MAJOR TTY_MAJOR |
80 | #endif | ||
80 | 81 | ||
81 | /* flag aliases */ | 82 | /* flag aliases */ |
82 | #define UPF_TXX9_HAVE_CTS_LINE UPF_BUGGY_UART | 83 | #define UPF_TXX9_HAVE_CTS_LINE UPF_BUGGY_UART |