From 86b4958bdcb07d0fda6425e4f584004633c597e6 Mon Sep 17 00:00:00 2001
From: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Date: Wed, 29 Feb 2012 21:49:21 +0530
Subject: [PATCH] --- yaml --- r: 296929 b: refs/heads/master c:
 381a752f291763bd6971521fa44c76ad9e937f7b h: refs/heads/master i:   296927:
 de8576667a68394c3861e84d57055c2a6e932cb1 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/gpio/gpio-omap.c  | 1 +
 trunk/drivers/gpio/gpio-tegra.c | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3be43fc8403a..ecbfdf955565 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0092f2665be3dd04f923d09a6a0deeddb4e96ec
+refs/heads/master: 381a752f291763bd6971521fa44c76ad9e937f7b
diff --git a/trunk/drivers/gpio/gpio-omap.c b/trunk/drivers/gpio/gpio-omap.c
index 7cbad8569268..1a144ac3b34e 100644
--- a/trunk/drivers/gpio/gpio-omap.c
+++ b/trunk/drivers/gpio/gpio-omap.c
@@ -511,6 +511,7 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)
 	else
 		bank->suspend_wakeup &= ~gpio_bit;
 
+	__raw_writel(bank->suspend_wakeup, bank->base + bank->regs->wkup_en);
 	spin_unlock_irqrestore(&bank->lock, flags);
 
 	return 0;
diff --git a/trunk/drivers/gpio/gpio-tegra.c b/trunk/drivers/gpio/gpio-tegra.c
index ceb1fd081b85..96662cc05ff9 100644
--- a/trunk/drivers/gpio/gpio-tegra.c
+++ b/trunk/drivers/gpio/gpio-tegra.c
@@ -428,7 +428,7 @@ static int __init tegra_gpio_init(void)
 }
 postcore_initcall(tegra_gpio_init);
 
-void tegra_gpio_config(struct tegra_gpio_table *table, int num)
+void __init tegra_gpio_config(struct tegra_gpio_table *table, int num)
 {
 	int i;