---

yaml --- r: 296929 b: refs/heads/master c: 381a752 h: refs/heads/master i: 296927: de85766 v: v3
git-mirror · Mar 20, 2012 · 86b4958 · 86b4958
1 parent d8b0aa1
commit 86b4958
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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;
-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
@@ Expand Down @@