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: 2647411 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id A321CDFE76 for ; Sat, 1 Jun 2013 09:18:40 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UihxO-0000HK-NU; Sat, 01 Jun 2013 09:18:38 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UihxM-00058u-RD; Sat, 01 Jun 2013 09:18:36 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UihxK-00058R-Tl for linux-arm-kernel@lists.infradead.org; Sat, 01 Jun 2013 09:18:35 +0000 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 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= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130601_051835_160582_B8B89CC8 X-CRM114-Status: UNSURE ( 6.40 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.10 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Kevin Hilman , linux-kernel@vger.kernel.org, Felipe Balbi , Sourav Poddar , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 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)