diff options
author | Tero Kristo | 2013-05-27 09:06:42 -0500 |
---|---|---|
committer | Tero Kristo | 2013-05-27 09:06:42 -0500 |
commit | 5cdf935dbd11bac3d895b1fb8482795e397c8894 (patch) | |
tree | 7c7f70d8706a9ca160bd5f24190db26b4f548b8c /include | |
parent | 36a2b8d10ee4f46f54afdb2e04e3ef8cf463ad52 (diff) | |
parent | a859e4a9b7e7354476e7546fb2b78d1aaa19d3f6 (diff) | |
download | kernel-audio-5cdf935dbd11bac3d895b1fb8482795e397c8894.tar.gz kernel-audio-5cdf935dbd11bac3d895b1fb8482795e397c8894.tar.xz kernel-audio-5cdf935dbd11bac3d895b1fb8482795e397c8894.zip |
Merge remote-tracking branch 'rnayak/platform-base-vayu-3.8.y' into vayu-pm-linux-3.8.y
Conflicts:
arch/arm/mach-omap2/clockdomain.h
arch/arm/mach-omap2/control.h
arch/arm/mach-omap2/omap-hotplug.c
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-omap2/pm_omap4plus.c
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/serial_core.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index c6690a2a27fb..a37858debaa7 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
@@ -32,6 +32,13 @@ | |||
32 | #include <linux/pps_kernel.h> | 32 | #include <linux/pps_kernel.h> |
33 | #include <uapi/linux/serial_core.h> | 33 | #include <uapi/linux/serial_core.h> |
34 | 34 | ||
35 | #ifdef CONFIG_SERIAL_CORE_CONSOLE | ||
36 | #define uart_console(port) \ | ||
37 | ((port)->cons && (port)->cons->index == (port)->line) | ||
38 | #else | ||
39 | #define uart_console(port) (0) | ||
40 | #endif | ||
41 | |||
35 | struct uart_port; | 42 | struct uart_port; |
36 | struct serial_struct; | 43 | struct serial_struct; |
37 | struct device; | 44 | struct device; |