summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-22 05:41:31 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-22 05:41:31 -0700
commit03b8cad5e2b38ba9105939caff8fb898dd2954ab (patch)
tree7e7ab82055cafa35daf7b2e40d7c826277593556 /include/linux
parentec2319ca46f6cd89f25dd812a229357eab4c7090 (diff)
parent33e8a4f82a0deb5b6384c4611a5f9db41ef82e5f (diff)
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/serial_core.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index f79c67d6f281..c653647073f1 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -80,6 +80,9 @@
/* SGI IP22 aka Indy / Challenge S / Indigo 2 */
#define PORT_IP22ZILOG 56
+/* Sharp LH7a40x -- an ARM9 SoC series */
+#define PORT_LH7A40X 57
+
#ifdef __KERNEL__
#include <linux/config.h>