From patchwork Tue Oct 2 16:36:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11949 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id CA16E23EFF for ; Tue, 2 Oct 2012 16:37:15 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 79181A18739 for ; Tue, 2 Oct 2012 16:37:15 +0000 (UTC) Received: by ieje10 with SMTP id e10so14608949iej.11 for ; Tue, 02 Oct 2012 09:37:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=UzC98yIzNxpqtuO1UtZThb9pt/Osk+VA3XeYNfPJnqk=; b=OwDp/R5O9tl5cm47V+FFyRAcRnrS0qwk25kWyLAKKdFMvj3zoD41D1WqLleTniJsb6 izxTrA66CBNx3cF7NoketbMcuKdu9YAVuQ3ouFnAgoO9nwJnTW/m+N+NNSMheNuBADje qvCL5g/RdBWohrPFLUeJdXHOK/nkME/+uufuMcNfpGG1SNQE8gkLyD2j4EzZ8puapBXz 8Df/8/5VDY8HHhCJw8hxtu5K2V2tfV1acMoxIJW25cLzlA7s6VMKY8mmueopzHB0CR+N VMgjknk3yxsS05lJDtGzfbSOhwReVRbD9Xg7gF49jpuP78A/xyDBQRW4HPG1IDl8IVVZ Wrag== Received: by 10.50.194.136 with SMTP id hw8mr9473852igc.28.1349195834625; Tue, 02 Oct 2012 09:37:14 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp92035igc; Tue, 2 Oct 2012 09:37:13 -0700 (PDT) Received: by 10.216.195.209 with SMTP id p59mr8890301wen.138.1349195832938; Tue, 02 Oct 2012 09:37:12 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.10]) by mx.google.com with ESMTPS id y82si1719770wep.94.2012.10.02.09.37.11 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Oct 2012 09:37:12 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.10 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.10; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.10 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from localhost.localdomain (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MWxmu-1SyHLe2w2W-00WQsF; Tue, 02 Oct 2012 18:37:11 +0200 From: Arnd Bergmann To: linux-arm-kernel@infradead.org Cc: arm@kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Marek Vasut , Carlos Eduardo Medaglia Dyonisio , Haojian Zhuang , Eric Miao Subject: [PATCH 04/17] ARM: pxa: define palmte2_pxa_keys conditionally Date: Tue, 2 Oct 2012 18:36:43 +0200 Message-Id: <1349195816-2225-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349195816-2225-1-git-send-email-arnd@arndb.de> References: <1349195816-2225-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:7B8gLeC1hpOkSCFc/PQDBdbou6/QfC9mBNB7VJaK/va OYsES2h/T9dNGlJg5CO5eMH4WKzvl7qPBvTM5sUQVVqpjROLT1 fbl99b3DWhogK9jWMLskVpojvwdx6kokQPz3QsZPJhbrdwGcgc br2KEsrYRIi1istDA00Sh5oNWk6UfytlVz9wIbNn5sRv5Oi672 STRGiqXjBiB4QUm3htsibgz6qcH+TltEM9bIs+bVHJ7gu57Zp6 fwDh8DxV71Y7q1TIte7/a8UrdZHRyivFDx1gfrZ1bUfhWY0VeD eef8WNw9iT61LkhGb+emJWu4k10mlpeyN14cD0LTyxaO/QKiRx GEZc8H/bggjiidxFLqFDyPdmycQeIIH4Crc4PNEgPjeXlOKDFQ 4Cozq/MxqADPw== X-Gm-Message-State: ALoCoQnKz+E3jRJEW0d7GlGbumvoW1m97HhJGaNYPtWjV5y72y1z6GfQ6H08cO7ThkfussZ2aWuO Gcc prints a harmless warning about palmte2_pxa_keys not being used when the gpio keyboard driver is disabled. The solution is to use the same #ifdef that is already present in the place where the symbol is used. Without this patch, building palmz72_defconfig results in: /home/arnd/linux-arm/arch/arm/mach-pxa/palmte2.c:128:31: warning: 'palmte2_pxa_keys' defined but not used [-Wunused-variable] Signed-off-by: Arnd Bergmann Cc: Marek Vasut Cc: Carlos Eduardo Medaglia Dyonisio Cc: Haojian Zhuang Cc: Eric Miao --- arch/arm/mach-pxa/palmte2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-pxa/palmte2.c b/arch/arm/mach-pxa/palmte2.c index c054827..8497b28 100644 --- a/arch/arm/mach-pxa/palmte2.c +++ b/arch/arm/mach-pxa/palmte2.c @@ -105,6 +105,7 @@ static struct pxamci_platform_data palmte2_mci_platform_data = { .gpio_power = GPIO_NR_PALMTE2_SD_POWER, }; +#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) /****************************************************************************** * GPIO keys ******************************************************************************/ @@ -132,6 +133,7 @@ static struct platform_device palmte2_pxa_keys = { .platform_data = &palmte2_pxa_keys_data, }, }; +#endif /****************************************************************************** * Backlight