Merge master.kernel.org:/home/rmk/linux-2.6-serial

2005-11-28 15:03:28 -08:00
parent cba2fa1861 cb3592be27
commit 5d240918e6
5 changed files with 9 additions and 6 deletions
@@ -121,6 +121,9 @@

 #define PORT_IP3106	70

+/* Hilscher netx */
+#define PORT_NETX	71
+
 #ifdef __KERNEL__

 #include <linux/config.h>