From patchwork Tue Aug 23 11:42:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 1088472 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7NCZHvF010605 for ; Tue, 23 Aug 2011 12:35:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754221Ab1HWMfQ (ORCPT ); Tue, 23 Aug 2011 08:35:16 -0400 Received: from d1.icnet.pl ([212.160.220.21]:38562 "EHLO d1.icnet.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752636Ab1HWMfQ (ORCPT ); Tue, 23 Aug 2011 08:35:16 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 23 Aug 2011 12:35:18 +0000 (UTC) X-Greylist: delayed 2809 seconds by postgrey-1.27 at vger.kernel.org; Tue, 23 Aug 2011 08:35:15 EDT Received: from 87-205-12-81.ip.netia.com.pl ([87.205.12.81] helo=vclass.localnet) by d1.icnet.pl with asmtp (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24) (Exim 4.34) id 1QvpXa-0002lZ-PS; Tue, 23 Aug 2011 13:53:14 +0200 From: Janusz Krzysztofik Organization: Tele-Info-System, Poznan, PL To: Grant Likely Subject: [PATCH 3.1-rc3] gpio/omap: fix build error with certain OMAP1 configs Date: Tue, 23 Aug 2011 13:42:24 +0200 User-Agent: KMail/1.13.7 (Linux/2.6.38-gentoo-r6; KDE/4.6.3; i686; ; ) Cc: linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Kevin Hilman MIME-Version: 1.0 Message-Id: <201108231342.25101.jkrzyszt@tis.icnet.pl> X-SA-Exim-Scanned: No (on d1.icnet); SAEximRunCond expanded to false Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org With commit f64ad1a0e21a, "gpio/omap: cleanup _set_gpio_wakeup(), remove ifdefs", access to build time conditionally omitted 'suspend_wakeup' member of the 'gpio_bank' structure has been placed unconditionally in function _set_gpio_wakeup(), which is always built. This resulted in the driver compilation broken for certain OMAP1, i.e., non-OMAP16xx, configurations. Really required or not in previously excluded cases, define this structure member unconditionally as a fix. Tested with a custom OMAP1510 only configuration. Signed-off-by: Janusz Krzysztofik Acked-by: Kevin Hilman --- drivers/gpio/gpio-omap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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 --- git/drivers/gpio/gpio-omap.c.orig 2011-08-22 08:34:02.000000000 +0200 +++ git/drivers/gpio/gpio-omap.c 2011-08-23 12:47:36.000000000 +0200 @@ -34,8 +34,8 @@ struct gpio_bank { u16 irq; u16 virtual_irq_start; int method; -#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS) u32 suspend_wakeup; +#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS) u32 saved_wakeup; #endif u32 non_wakeup_gpios;