diff options
| author | Tom Rini <trini@kernel.crashing.org> | 2004-11-10 21:42:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-10 21:42:01 -0800 |
| commit | bb97b2d9119429b63de09c8e9d1bb8d14dd7791c (patch) | |
| tree | 4d8f527e915a2e1d391acc4bb03905e7b41f2c4d /drivers | |
| parent | 30c1c5842b28c7f5cb6b4ad4101f7423088626af (diff) | |
[PATCH] Fix CPM2 uart driver device number brain damage
The following patch against 2.6.10-rc1 fixes the brain damage that was
found in the CPM2 uart driver. Previously, if 8250 was configured in, it
would use one set of numbers (which at the time didn't conflict with
anything, but have since been officially given to the Motorola i.MX driver)
and if 8250 wasn't in, it would masquerade as it. The following switches
us over to 204/46...49 (Which is still unclaimed).
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Cc: <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/cpm_uart/cpm_uart.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/serial/cpm_uart/cpm_uart.h index 0e4d31bd1dae..5f6187baad86 100644 --- a/drivers/serial/cpm_uart/cpm_uart.h +++ b/drivers/serial/cpm_uart/cpm_uart.h @@ -17,13 +17,8 @@ #include "cpm_uart_cpm1.h" #endif -#ifndef CONFIG_SERIAL_8250 -#define SERIAL_CPM_MAJOR TTY_MAJOR -#define SERIAL_CPM_MINOR 64 -#else #define SERIAL_CPM_MAJOR 204 -#define SERIAL_CPM_MINOR 42 -#endif +#define SERIAL_CPM_MINOR 46 #define IS_SMC(pinfo) (pinfo->flags & FLAG_SMC) #define IS_DISCARDING(pinfo) (pinfo->flags & FLAG_DISCARDING) |