diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-15 15:10:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-15 15:10:32 -0500 |
| commit | 537a2f889ac847468c9aa040910c247b218302a7 (patch) | |
| tree | ea21b1dfd11e4234b108059c84c2a42887dc9254 /include/linux | |
| parent | fab349cceb25f92bac1400601c5ef8345a166958 (diff) | |
| parent | 272966c070237c8cb540fe67e06df51bc6ea9cc2 (diff) | |
Merge branch 'sh/for-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
serial: sh-sci: Reorder the SCxTDR write after the TDxE clear.
sh: __copy_user function can corrupt the stack in case of exception
sh: Fixed the TMU0 reload value on resume
sh: Don't factor in PAGE_OFFSET for valid_phys_addr_range() check.
sh: early printk port type fix
i2c: fix i2c-sh_mobile rx underrun
sh: Provide a sane valid_phys_addr_range() to prevent TLB reset with PMB.
usb: r8a66597-hcd: fix wrong data access in SuperH on-chip USB
fix sci type for SH7723
serial: sh-sci: fix cannot work SH7723 SCIFA
sh: Handle fixmap TLB eviction more coherently.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial_core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index e27f216361fc..4e4f1277f3bf 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
| @@ -155,6 +155,9 @@ | |||
| 155 | 155 | ||
| 156 | #define PORT_SC26XX 82 | 156 | #define PORT_SC26XX 82 |
| 157 | 157 | ||
| 158 | /* SH-SCI */ | ||
| 159 | #define PORT_SCIFA 83 | ||
| 160 | |||
| 158 | #ifdef __KERNEL__ | 161 | #ifdef __KERNEL__ |
| 159 | 162 | ||
| 160 | #include <linux/compiler.h> | 163 | #include <linux/compiler.h> |