diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-18 17:15:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-18 17:15:30 -0500 |
| commit | fdb0a1a67e131f07a308730c80d07e330211d2e0 (patch) | |
| tree | 4fbf35055fc965737c1ffdbcfe98d7ea8335f940 /include | |
| parent | fc0b7a20368193e1f7cf1376624eed419b9c33e6 (diff) | |
| parent | 7bb56d01f111890414fbe35412698485b68ed468 (diff) | |
Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 4e4f1277f3bf..feb3b939ec4b 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
| @@ -158,6 +158,8 @@ | |||
| 158 | /* SH-SCI */ | 158 | /* SH-SCI */ |
| 159 | #define PORT_SCIFA 83 | 159 | #define PORT_SCIFA 83 |
| 160 | 160 | ||
| 161 | #define PORT_S3C6400 84 | ||
| 162 | |||
| 161 | #ifdef __KERNEL__ | 163 | #ifdef __KERNEL__ |
| 162 | 164 | ||
| 163 | #include <linux/compiler.h> | 165 | #include <linux/compiler.h> |