diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
| commit | c3cc99ff5d24e2eeaf7ec2032e720681916990e3 (patch) | |
| tree | c3e74171bbbd2adde9d60b9db1c440415c8d2831 /include/linux/serial_core.h | |
| parent | 38ffbe66d59051fd9cfcfc8545f164700e2fa3bc (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
Merge branch 'linus' into x86/xen
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 |