summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-15 12:10:32 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-15 12:10:32 -0800
commit537a2f889ac847468c9aa040910c247b218302a7 (patch)
treeea21b1dfd11e4234b108059c84c2a42887dc9254 /include
parentfab349cceb25f92bac1400601c5ef8345a166958 (diff)
parent272966c070237c8cb540fe67e06df51bc6ea9cc2 (diff)
downloadlinux-3.10-537a2f889ac847468c9aa040910c247b218302a7.tar.gz
linux-3.10-537a2f889ac847468c9aa040910c247b218302a7.tar.bz2
linux-3.10-537a2f889ac847468c9aa040910c247b218302a7.zip
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')
-rw-r--r--include/linux/serial_core.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index e27f216361f..4e4f1277f3b 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -155,6 +155,9 @@
#define PORT_SC26XX 82
+/* SH-SCI */
+#define PORT_SCIFA 83
+
#ifdef __KERNEL__
#include <linux/compiler.h>