diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-10 22:40:04 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-10 22:40:04 +0100 |
| commit | b0efb42478c81ed0ed9aa0dc444db200c32624f0 (patch) | |
| tree | 79d45597910c636892f6e7bc710df6174ef54bc8 /arch/arm/mach-ep93xx/core.c | |
| parent | bd78512e5c0d202847ee3dba2fc3740676e196c7 (diff) | |
| parent | 4070243250dd06a96d874b0be3cb3a39ef23597c (diff) | |
| download | op-kernel-dev-b0efb42478c81ed0ed9aa0dc444db200c32624f0.zip op-kernel-dev-b0efb42478c81ed0ed9aa0dc444db200c32624f0.tar.gz | |
Merge branch 'ep93xx' into devel
Diffstat (limited to 'arch/arm/mach-ep93xx/core.c')
| -rw-r--r-- | arch/arm/mach-ep93xx/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index c535e88..f477df0 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c @@ -155,7 +155,7 @@ static unsigned char gpio_int_unmasked[3]; static unsigned char gpio_int_enabled[3]; static unsigned char gpio_int_type1[3]; static unsigned char gpio_int_type2[3]; -static unsigned char gpio_int_debouce[3]; +static unsigned char gpio_int_debounce[3]; /* Port ordering is: A B F */ static const u8 int_type1_register_offset[3] = { 0x90, 0xac, 0x4c }; @@ -192,11 +192,11 @@ void ep93xx_gpio_int_debounce(unsigned int irq, int enable) int port_mask = 1 << (line & 7); if (enable) - gpio_int_debouce[port] |= port_mask; + gpio_int_debounce[port] |= port_mask; else - gpio_int_debouce[port] &= ~port_mask; + gpio_int_debounce[port] &= ~port_mask; - __raw_writeb(gpio_int_debouce[port], + __raw_writeb(gpio_int_debounce[port], EP93XX_GPIO_REG(int_debounce_register_offset[port])); } EXPORT_SYMBOL(ep93xx_gpio_int_debounce); |
