diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-30 15:44:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-30 15:44:21 -0700 |
| commit | c01ec7b1ea61b1c7febfe09d7751a4d916194aaf (patch) | |
| tree | 0cb86fd908d91cfc78858e003de9eb43f0508cb0 /arch/arm/plat-omap/gpio.c | |
| parent | 5e9772b95ba848516b2c76c11cf6f4aa4aa232a5 (diff) | |
| parent | 41bd03ba0758a076671e5de35ed084535984143d (diff) | |
| download | linux-stable-c01ec7b1ea61b1c7febfe09d7751a4d916194aaf.tar.gz linux-stable-c01ec7b1ea61b1c7febfe09d7751a4d916194aaf.tar.bz2 linux-stable-c01ec7b1ea61b1c7febfe09d7751a4d916194aaf.zip | |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
OMAP: hwmod: Fix the missing braces
OMAP4: clock: Fix multi-omap boot with reset un-used clocks
OMAP3: PM: fix IO daisy chain enable to use PM_WKEN reg
omap: GPIO: fix auto-disable of debounce clock
omap: DMTIMER: Ack pending interrupt always when stopping a timer
omap: Stalker board: switch over to gpio_set_debounce
omap: fix build failure due to missing include dma-mapping.h
omap iommu: Fix Memory leak
Diffstat (limited to 'arch/arm/plat-omap/gpio.c')
| -rw-r--r-- | arch/arm/plat-omap/gpio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 393e9219a5b6..9b7e3545f325 100644 --- 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); } + bank->dbck_enable_mask = val; __raw_writel(val, reg); } |