git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xen/xenbus' into upstream/xen
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
gpio.c
diff --git
a/arch/arm/plat-omap/gpio.c
b/arch/arm/plat-omap/gpio.c
index
393e921
..
9b7e354
100644
(file)
--- a/
arch/arm/plat-omap/gpio.c
+++ b/
arch/arm/plat-omap/gpio.c
@@
-673,6
+673,7
@@
static void _set_gpio_debounce(struct gpio_bank *bank, unsigned gpio,
if (cpu_is_omap34xx() || cpu_is_omap44xx())
clk_disable(bank->dbck);
}
if (cpu_is_omap34xx() || cpu_is_omap44xx())
clk_disable(bank->dbck);
}
+ bank->dbck_enable_mask = val;
__raw_writel(val, reg);
}
__raw_writel(val, reg);
}