summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-10-08 10:20:40 -0700
committerTony Lindgren <tony@atomide.com>2010-10-08 10:20:40 -0700
commitbc3caae8a191c712d8ae666d0b8d18807bfe2b14 (patch)
tree7b338ebba2f1fdbcee3785789bf9f4a74d93aa94 /include/linux
parent73c5ef126f40b0b872e5964ff65dbe792eeec493 (diff)
parent69758ab7a1e2de5636a2188d5357dd03140bf1d8 (diff)
Merge branch 'pm-hwmods' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'include/linux')
-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 563e23400913..295e89817de8 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -196,6 +196,9 @@
/* High Speed UART for Medfield */
#define PORT_MFD 95
+/* TI OMAP-UART */
+#define PORT_OMAP 96
+
#ifdef __KERNEL__
#include <linux/compiler.h>