From f33e166b4930c02908c737e90a3652325ba3a7ec Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 28 Mar 2011 13:12:20 +0200 Subject: [PATCH] --- yaml --- r: 243270 b: refs/heads/master c: 4fe25e3898ec53de322f32b67afa2be872f8ed21 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-nomadik/gpio.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index baf73941b8a2..56d6273a953a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 504f1dfeccb3f523a3faefb0802016c818efa5fb +refs/heads/master: 4fe25e3898ec53de322f32b67afa2be872f8ed21 diff --git a/trunk/arch/arm/plat-nomadik/gpio.c b/trunk/arch/arm/plat-nomadik/gpio.c index 80643bc38e10..6436ba597c12 100644 --- a/trunk/arch/arm/plat-nomadik/gpio.c +++ b/trunk/arch/arm/plat-nomadik/gpio.c @@ -541,13 +541,6 @@ static void __nmk_gpio_irq_modify(struct nmk_gpio_chip *nmk_chip, static void __nmk_gpio_set_wake(struct nmk_gpio_chip *nmk_chip, int gpio, bool on) { -#ifdef CONFIG_ARCH_U8500 - if (cpu_is_u8500v2()) { - __nmk_gpio_set_slpm(nmk_chip, gpio - nmk_chip->chip.base, - on ? NMK_GPIO_SLPM_WAKEUP_ENABLE - : NMK_GPIO_SLPM_WAKEUP_DISABLE); - } -#endif __nmk_gpio_irq_modify(nmk_chip, gpio, WAKE, on); }