diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
| commit | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (patch) | |
| tree | 8129b5907161bc6ae26deb3645ce1e280c5e1f51 /include/linux/serial_core.h | |
| parent | b2139aa0eec330c711c5a279db361e5ef1178e78 (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts:
include/asm-x86/dma-mapping.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/serial_core.h')
| -rw-r--r-- | include/linux/serial_core.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index f3a1c0e45021..3b2f6c04855e 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
| @@ -59,9 +59,6 @@ | |||
| 59 | #define PORT_SUNZILOG 38 | 59 | #define PORT_SUNZILOG 38 |
| 60 | #define PORT_SUNSAB 39 | 60 | #define PORT_SUNSAB 39 |
| 61 | 61 | ||
| 62 | /* NEC v850. */ | ||
| 63 | #define PORT_V850E_UART 40 | ||
| 64 | |||
| 65 | /* DEC */ | 62 | /* DEC */ |
| 66 | #define PORT_DZ 46 | 63 | #define PORT_DZ 46 |
| 67 | #define PORT_ZS 47 | 64 | #define PORT_ZS 47 |