From fa9880fa3e335b71e41ff643882aabfb09f3d67e Mon Sep 17 00:00:00 2001 From: Shubhrajyoti D Date: Mon, 16 Jan 2012 15:52:37 +0530 Subject: [PATCH] --- yaml --- r: 287053 b: refs/heads/master c: b5148856a2f732e7e99edad22bb8e2037af28ad3 h: refs/heads/master i: 287051: 1090006299312ef75997e94c5b488c43425ae07e v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/omap-serial.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e52fca79af2e..6e3abe465e3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bc4f0d8f65b396d214a31195a91c0394c5bf628 +refs/heads/master: b5148856a2f732e7e99edad22bb8e2037af28ad3 diff --git a/trunk/drivers/tty/serial/omap-serial.c b/trunk/drivers/tty/serial/omap-serial.c index 33e3360023b3..1c2426931484 100644 --- a/trunk/drivers/tty/serial/omap-serial.c +++ b/trunk/drivers/tty/serial/omap-serial.c @@ -1521,6 +1521,7 @@ static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1) } } +#ifdef CONFIG_PM_RUNTIME static void serial_omap_restore_context(struct uart_omap_port *up) { if (up->errata & UART_ERRATA_i202_MDR1_ACCESS) @@ -1550,7 +1551,6 @@ static void serial_omap_restore_context(struct uart_omap_port *up) serial_out(up, UART_OMAP_MDR1, up->mdr1); } -#ifdef CONFIG_PM_RUNTIME static int serial_omap_runtime_suspend(struct device *dev) { struct uart_omap_port *up = dev_get_drvdata(dev);