diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-28 18:03:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-28 18:03:28 -0500 |
| commit | 5d240918e6813b5c050eeff0c06480ee29e66df9 (patch) | |
| tree | 892b99b99726f2dd6d9d562514810763d7c26098 /include/linux | |
| parent | cba2fa186146aacde99bba3dcd713552dad5a897 (diff) | |
| parent | cb3592be272d83011051dc49f4326355c01f1e1f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial_core.h | 3 |
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 @@ | |||
| 121 | 121 | ||
| 122 | #define PORT_IP3106 70 | 122 | #define PORT_IP3106 70 |
| 123 | 123 | ||
| 124 | /* Hilscher netx */ | ||
| 125 | #define PORT_NETX 71 | ||
| 126 | |||
| 124 | #ifdef __KERNEL__ | 127 | #ifdef __KERNEL__ |
| 125 | 128 | ||
| 126 | #include <linux/config.h> | 129 | #include <linux/config.h> |