diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/serial_core.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/serial_core.h')
| -rw-r--r-- | include/linux/serial_core.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 7cb094a82456..d32123ae08ad 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
| @@ -149,13 +149,15 @@ | |||
| 149 | /* Freescale ColdFire */ | 149 | /* Freescale ColdFire */ |
| 150 | #define PORT_MCF 78 | 150 | #define PORT_MCF 78 |
| 151 | 151 | ||
| 152 | #define PORT_SC26XX 79 | 152 | /* Blackfin SPORT */ |
| 153 | 153 | #define PORT_BFIN_SPORT 79 | |
| 154 | 154 | ||
| 155 | /* MN10300 on-chip UART numbers */ | 155 | /* MN10300 on-chip UART numbers */ |
| 156 | #define PORT_MN10300 80 | 156 | #define PORT_MN10300 80 |
| 157 | #define PORT_MN10300_CTS 81 | 157 | #define PORT_MN10300_CTS 81 |
| 158 | 158 | ||
| 159 | #define PORT_SC26XX 82 | ||
| 160 | |||
| 159 | #ifdef __KERNEL__ | 161 | #ifdef __KERNEL__ |
| 160 | 162 | ||
| 161 | #include <linux/compiler.h> | 163 | #include <linux/compiler.h> |