[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1349195816-2225-5-git-send-email-arnd@arndb.de>
Date: Tue, 2 Oct 2012 18:36:43 +0200
From: Arnd Bergmann <arnd@...db.de>
To: linux-arm-kernel@...radead.org
Cc: arm@...nel.org, linux-kernel@...r.kernel.org,
Arnd Bergmann <arnd@...db.de>,
Marek Vasut <marek.vasut@...il.com>,
Carlos Eduardo Medaglia Dyonisio <cadu@...dfeliz.com>,
Haojian Zhuang <haojian.zhuang@...il.com>,
Eric Miao <eric.y.miao@...il.com>
Subject: [PATCH 04/17] ARM: pxa: define palmte2_pxa_keys conditionally
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 <arnd@...db.de>
Cc: Marek Vasut <marek.vasut@...il.com>
Cc: Carlos Eduardo Medaglia Dyonisio <cadu@...dfeliz.com>
Cc: Haojian Zhuang <haojian.zhuang@...il.com>
Cc: Eric Miao <eric.y.miao@...il.com>
---
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
--
1.7.10
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists