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

This commit is contained in:
Linus Torvalds 2005-11-28 15:03:28 -08:00
commit 5d240918e6
5 changed files with 9 additions and 6 deletions

View file

@ -121,6 +121,9 @@
#define PORT_IP3106 70
/* Hilscher netx */
#define PORT_NETX 71
#ifdef __KERNEL__
#include <linux/config.h>