From patchwork Sat Jun 1 09:18:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2647391 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id EE403DFE76 for ; Sat, 1 Jun 2013 09:18:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755965Ab3FAJSM (ORCPT ); Sat, 1 Jun 2013 05:18:12 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:61012 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751946Ab3FAJSK (ORCPT ); Sat, 1 Jun 2013 05:18:10 -0400 Received: from wuerfel.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0M2HoW-1US8V92cTs-00savB; Sat, 01 Jun 2013 11:18:07 +0200 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sourav Poddar , Kevin Hilman , Felipe Balbi Subject: [PATCH] serial: omap: repair building without PM_SLEEP Date: Sat, 01 Jun 2013 11:18:13 +0200 Message-ID: <1844339.mxci2DdvBF@wuerfel> User-Agent: KMail/4.10.2 (Linux/3.10.0-rc3-next-20130527+; KDE/4.10.3; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:DYTE8GGr0mH6wHpQ2Nwqhiwpy8hXsjeyJ1xN+4xp3Fs gCCZlc5QAAQKVTJW3HFCGFQizfduMBecV41hH3XCXdj5t2+SSN UnZh0akGi7iQNne59CJpQjc3+p/tTaImDBxX8bV3Ka3ULozDQ8 Y8nxGHRDl6vUMwORW8/W7aV3a+O13CaVxWy3Cv3MhJ6IjzSLQ+ wTyAeCKve65gQl2ccHEcTS9D7tGH9icPef7A7DakUE16ji1NOI IqW2xANl+yFI0+nqsFTG/w2H1WyIJ6VGGJ19h5b2KbQZGGZNrS d8VWrvYRPMMCaktStMI0q25xcUOqz3L9pJutDfGzLbDj27QKo0 zDaasUprkymJvaRTdXsM= Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org 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 Acked-by: Kevin Hilman --- Please apply for 3.10-rc -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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)