diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-01 21:32:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-01 21:32:46 -0800 |
| commit | ec33b309101bb2904e9fe20252f7760e254d05ec (patch) | |
| tree | 13cde551f2ef845801d9e59081258572e1ac222a /include | |
| parent | 7f36b1e9582c06d0ddef5f2416c9b17017647d1f (diff) | |
| parent | 913ade51eca369553a8ffbdaf1f426fade84f6ae (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_core.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 2b0401b93f2b..9d2579230689 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -39,8 +39,7 @@ #define PORT_RSA 13 #define PORT_NS16550A 14 #define PORT_XSCALE 15 -#define PORT_IP3106 16 -#define PORT_MAX_8250 16 /* max port ID */ +#define PORT_MAX_8250 15 /* max port ID */ /* * ARM specific type numbers. These are not currently guaranteed @@ -118,7 +117,9 @@ #define PORT_M32R_SIO 68 /*Digi jsm */ -#define PORT_JSM 65 +#define PORT_JSM 69 + +#define PORT_IP3106 70 #ifdef __KERNEL__ |