| Message ID | 1343136369-14636-3-git-send-email-laurent.pinchart@ideasonboard.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Tue, Jul 24, 2012 at 03:26:09PM +0200, Laurent Pinchart wrote: > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > arch/arm/mach-shmobile/board-armadillo800eva.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) Tested-by: Simon Horman <horms@verge.net.au> -- To unsubscribe from this list: send the line "unsubscribe linux-sh" 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/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index 04cb65a..a70993f 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -412,10 +412,11 @@ static struct platform_device lcdc0_device = { }; /* GPIO KEY */ -#define GPIO_KEY(c, g, d) { .code = c, .gpio = g, .desc = d, .active_low = 1 } +#define GPIO_KEY(c, g, d, ...) \ + { .code = c, .gpio = g, .desc = d, .active_low = 1, __VA_ARGS__ } static struct gpio_keys_button gpio_buttons[] = { - GPIO_KEY(KEY_POWER, GPIO_PORT99, "SW3"), + GPIO_KEY(KEY_POWER, GPIO_PORT99, "SW3", .wakeup = 1), GPIO_KEY(KEY_BACK, GPIO_PORT100, "SW4"), GPIO_KEY(KEY_MENU, GPIO_PORT97, "SW5"), GPIO_KEY(KEY_HOME, GPIO_PORT98, "SW6"),
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- arch/arm/mach-shmobile/board-armadillo800eva.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)