diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-01 13:24:10 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-01 13:24:10 -0700 |
| commit | 69758ab7a1e2de5636a2188d5357dd03140bf1d8 (patch) | |
| tree | 13d65cbee4cc6bfed697bd164a15529ad86c2b25 /include/linux | |
| parent | 963bfb0939232e415c7bfb19b08dce300eb148d9 (diff) | |
| parent | 257f23d87f9309fee41d468575404b9371bf4c7d (diff) | |
| download | cachepc-linux-69758ab7a1e2de5636a2188d5357dd03140bf1d8.tar.gz cachepc-linux-69758ab7a1e2de5636a2188d5357dd03140bf1d8.zip | |
manual merge for pm-hwmod-uart due to conflicts
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 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> |