diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-14 01:11:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-14 01:11:34 -0700 |
| commit | 491a0f428301ebf9d63f955695e31014d13d54b9 (patch) | |
| tree | 9a45972a6c8129c5f3550156f8bfe4a4b6f5b8ff /include/linux | |
| parent | 7635947f63bee4eae9003f423513f0a4c9ca6011 (diff) | |
| parent | e86f59c38f2b1ac0bdd12e59ca563232b43b4309 (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial_core.h | 3 | ||||
| -rw-r--r-- | include/linux/serial_reg.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 701d138cefb8..4d7dd853874b 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -36,7 +36,8 @@ #define PORT_16850 12 #define PORT_RSA 13 #define PORT_NS16550A 14 -#define PORT_MAX_8250 14 /* max port ID */ +#define PORT_XSCALE 15 +#define PORT_MAX_8250 15 /* max port ID */ /* * ARM specific type numbers. These are not currently guaranteed diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h index 49aa0db7fa0e..7b2414bd5837 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h @@ -142,7 +142,7 @@ #define UART_MSR_ANY_DELTA 0x0F /* Any of the delta bits! */ /* - * The Intel PXA2xx chip defines those bits + * The Intel XScale on-chip UARTs define these bits */ #define UART_IER_DMAE 0x80 /* DMA Requests Enable */ #define UART_IER_UUE 0x40 /* UART Unit Enable */ |