diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 15:23:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 15:23:49 -0500 |
| commit | bf785ee0aeea7a3e717cb1e11df4135b6cbde7da (patch) | |
| tree | 32ae52ad51c2a3952f2e1a2af9217717954fa593 /include/linux | |
| parent | 8b87e1baff24e586c3fe6c168843d213119bf4dd (diff) | |
| parent | 00431707be0cc1236ee08459367872b57da5be29 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial_core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index e3710d7e260a..a8187c3c8a7b 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
| @@ -67,6 +67,9 @@ | |||
| 67 | /* Parisc type numbers. */ | 67 | /* Parisc type numbers. */ |
| 68 | #define PORT_MUX 48 | 68 | #define PORT_MUX 48 |
| 69 | 69 | ||
| 70 | /* Atmel AT91RM9200 SoC */ | ||
| 71 | #define PORT_AT91RM9200 49 | ||
| 72 | |||
| 70 | /* Macintosh Zilog type numbers */ | 73 | /* Macintosh Zilog type numbers */ |
| 71 | #define PORT_MAC_ZILOG 50 /* m68k : not yet implemented */ | 74 | #define PORT_MAC_ZILOG 50 /* m68k : not yet implemented */ |
| 72 | #define PORT_PMAC_ZILOG 51 | 75 | #define PORT_PMAC_ZILOG 51 |