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

This commit is contained in:
Linus Torvalds 2005-11-01 21:32:46 -08:00
commit ec33b30910
3 changed files with 64 additions and 13 deletions

View file

@ -39,8 +39,7 @@
#define PORT_RSA 13
#define PORT_NS16550A 14
#define PORT_XSCALE 15
#define PORT_IP3106 16
#define PORT_MAX_8250 16 /* max port ID */
#define PORT_MAX_8250 15 /* max port ID */
/*
* ARM specific type numbers. These are not currently guaranteed
@ -118,7 +117,9 @@
#define PORT_M32R_SIO 68
/*Digi jsm */
#define PORT_JSM 65
#define PORT_JSM 69
#define PORT_IP3106 70
#ifdef __KERNEL__