summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-28 15:03:28 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-28 15:03:28 -0800
commit5d240918e6813b5c050eeff0c06480ee29e66df9 (patch)
tree892b99b99726f2dd6d9d562514810763d7c26098 /include
parentcba2fa186146aacde99bba3dcd713552dad5a897 (diff)
parentcb3592be272d83011051dc49f4326355c01f1e1f (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include')
-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 a3ac92b19aca..e3710d7e260a 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -121,6 +121,9 @@
#define PORT_IP3106 70
+/* Hilscher netx */
+#define PORT_NETX 71
+
#ifdef __KERNEL__
#include <linux/config.h>