From cd18b72d26ba0dee3bdf1d0d152e6db2b2a0c9b2 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 25 Sep 2006 12:41:45 +0300 Subject: [PATCH] --- yaml --- r: 36643 b: refs/heads/master c: 0d9356cbb5d7a0bc8628f74fb15fd7268372c7fe h: refs/heads/master i: 36641: 178dbf6e1b18628882c16278ada2140ec1684aaa 36639: f0ad9c21c22555ab0547d0858f4b7fbfa48421ce v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/gpio.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f5dc09449f7b..282c4fe4d00c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39020842b3d8a450e80724a71d5df676535d249e +refs/heads/master: 0d9356cbb5d7a0bc8628f74fb15fd7268372c7fe diff --git a/trunk/arch/arm/plat-omap/gpio.c b/trunk/arch/arm/plat-omap/gpio.c index 21d38098c73d..f7f929a14bf5 100644 --- a/trunk/arch/arm/plat-omap/gpio.c +++ b/trunk/arch/arm/plat-omap/gpio.c @@ -1159,8 +1159,8 @@ static int omap_gpio_resume(struct sys_device *dev) wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA; break; case METHOD_GPIO_24XX: - wake_clear = bank->base + OMAP1610_GPIO_CLEAR_WAKEUPENA; - wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA; + wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; + wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA; break; default: continue;