summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2003-07-17 23:29:54 -0700
committerLinus Torvalds <torvalds@home.osdl.org>2003-07-17 23:29:54 -0700
commit051063b55f000f3e6d3915e6aa37f40b9eb0d619 (patch)
tree9d50e1f413d00180c3c8fa9fe162f3dffaea68b8 /include/linux
parent9430d91bae2e57437d9ca3a2a98514c43e5b4868 (diff)
parent3b728486d25f2046d6b8a9be89a1d7c46bd6df42 (diff)
Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/serial_core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 93ab5714ad94..a7cb796c4deb 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -57,7 +57,7 @@
#define PORT_SUNSAB 39
/* NEC v850. */
-#define PORT_NB85E_UART 40
+#define PORT_V850E_UART 40
/* NEC PC-9800 */
#define PORT_8251_PC98 41