diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /include/linux/serial_core.h | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'include/linux/serial_core.h')
| -rw-r--r-- | include/linux/serial_core.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 7f2c99d66e9d..773d8d8828ad 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
| @@ -62,8 +62,9 @@ | |||
| 62 | /* NEC v850. */ | 62 | /* NEC v850. */ |
| 63 | #define PORT_V850E_UART 40 | 63 | #define PORT_V850E_UART 40 |
| 64 | 64 | ||
| 65 | /* DZ */ | 65 | /* DEC */ |
| 66 | #define PORT_DZ 47 | 66 | #define PORT_DZ 46 |
| 67 | #define PORT_ZS 47 | ||
| 67 | 68 | ||
| 68 | /* Parisc type numbers. */ | 69 | /* Parisc type numbers. */ |
| 69 | #define PORT_MUX 48 | 70 | #define PORT_MUX 48 |
| @@ -142,6 +143,9 @@ | |||
| 142 | /* Micrel KS8695 */ | 143 | /* Micrel KS8695 */ |
| 143 | #define PORT_KS8695 76 | 144 | #define PORT_KS8695 76 |
| 144 | 145 | ||
| 146 | /* Broadcom SB1250, etc. SOC */ | ||
| 147 | #define PORT_SB1250_DUART 77 | ||
| 148 | |||
| 145 | 149 | ||
| 146 | #ifdef __KERNEL__ | 150 | #ifdef __KERNEL__ |
| 147 | 151 | ||