All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] serial: omap: repair building without PM_SLEEP
@ 2013-06-01  9:18 ` Arnd Bergmann
  0 siblings, 0 replies; 11+ messages in thread
From: Arnd Bergmann @ 2013-06-01  9:18 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: linux-kernel, linux-omap, linux-arm-kernel, Sourav Poddar,
	Kevin Hilman, Felipe Balbi

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>
---
Please apply for 3.10-rc

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 393a8eb..1aaeca8 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)
 }
 #else
 #define serial_omap_prepare NULL
-#define serial_omap_prepare NULL
+#define serial_omap_complete NULL
 #endif /* CONFIG_PM_SLEEP */
 
 static void omap_serial_fill_features_erratas(struct uart_omap_port *up)


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2013-06-03 18:50 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-01  9:18 [PATCH] serial: omap: repair building without PM_SLEEP Arnd Bergmann
2013-06-01  9:18 ` Arnd Bergmann
2013-06-01 11:48 ` Sourav Poddar
2013-06-01 11:48   ` Sourav Poddar
2013-06-01 11:48   ` Sourav Poddar
2013-06-03 17:07 ` Greg Kroah-Hartman
2013-06-03 17:07   ` Greg Kroah-Hartman
2013-06-03 18:43   ` Arnd Bergmann
2013-06-03 18:43     ` Arnd Bergmann
2013-06-03 18:50   ` Kevin Hilman
2013-06-03 18:50     ` Kevin Hilman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.