OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...
[sagit-ice-cold/kernel_xiaomi_msm8998.git]
/
drivers
/
tty
/
serial
/
omap-serial.c
diff --git
a/drivers/tty/serial/omap-serial.c
b/drivers/tty/serial/omap-serial.c
index
435478a
..
2e1073d
100644
(file)
--- a/
drivers/tty/serial/omap-serial.c
+++ b/
drivers/tty/serial/omap-serial.c
@@
-1776,7
+1776,7
@@
static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1)
}
}
-#ifdef CONFIG_PM
_RUNTIME
+#ifdef CONFIG_PM
static void serial_omap_restore_context(struct uart_omap_port *up)
{
if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)