mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 22:23:14 -04:00
Merge master.kernel.org:/home/rmk/linux-2.6-serial
This commit is contained in:
commit
ec33b30910
3 changed files with 64 additions and 13 deletions
|
|
@ -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__
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue