diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-01 05:18:13 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-03 17:30:49 -0400 |
| commit | 2cb5a2fa219897e5d4ccd8831e8d0f3d6e6f0f23 (patch) | |
| tree | f936bc1ed1808c4ee4779bc3218e50cbd14a4466 /drivers/tty | |
| parent | 1b615beec7e8a1c40158c69a142e9e9832a6f7ad (diff) | |
serial: omap: repair building without PM_SLEEP
A recent bug fix in 3.10, ddd85e225c "serial: omap: prevent runtime PM for
"no_console_suspend"", introduced a regression from an obvious typo:
drivers/tty/serial/omap-serial.c:1677:14: error: 'serial_omap_complete'
undeclared here (not in a function)
This changes the incorrectly added macro to the one that we need instead.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Bin Liu <b-liu@ti.com>
Acked-by: Sourav Poddar<sourav.poddar@ti.com>
Tested-by: Sourav Poddar<sourav.poddar@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 393a8eb98d72..1aaeca8727d4 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c | |||
| @@ -1326,7 +1326,7 @@ static int serial_omap_resume(struct device *dev) | |||
| 1326 | } | 1326 | } |
| 1327 | #else | 1327 | #else |
| 1328 | #define serial_omap_prepare NULL | 1328 | #define serial_omap_prepare NULL |
| 1329 | #define serial_omap_prepare NULL | 1329 | #define serial_omap_complete NULL |
| 1330 | #endif /* CONFIG_PM_SLEEP */ | 1330 | #endif /* CONFIG_PM_SLEEP */ |
| 1331 | 1331 | ||
| 1332 | static void omap_serial_fill_features_erratas(struct uart_omap_port *up) | 1332 | static void omap_serial_fill_features_erratas(struct uart_omap_port *up) |