diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 11:38:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 11:38:37 -0700 |
commit | 48f286a28fe13fcbc510720fcffb872a184b51dd (patch) | |
tree | f50d868589138628c04dd5600a029ef80fa21da2 /drivers/mfd/twl4030-irq.c | |
parent | ea431793f198e26d1553f36ed8b5a830b531eee4 (diff) | |
parent | fa15ce8ad59e9653d50b8596596cb02d3566d4aa (diff) | |
download | kernel_goldelico_gta04-48f286a28fe13fcbc510720fcffb872a184b51dd.zip kernel_goldelico_gta04-48f286a28fe13fcbc510720fcffb872a184b51dd.tar.gz kernel_goldelico_gta04-48f286a28fe13fcbc510720fcffb872a184b51dd.tar.bz2 |
Merge branch 'for-next' of git://git.o-hand.com/linux-mfd
* 'for-next' of git://git.o-hand.com/linux-mfd:
mfd: fix da903x warning
mfd: fix MAINTAINERS entry
mfd: Use the value of the final spin when reading the AUXADC
mfd: Storage class should be before const qualifier
mfd: PASIC3: supply clock_rate to DS1WM via driver_data
mfd: remove DS1WM clock handling
mfd: remove unused PASIC3 bus_shift field
pxa/magician: remove deprecated .bus_shift from PASIC3 platform_data
mfd: convert PASIC3 to use MFD core
mfd: convert DS1WM to use MFD core
mfd: Support active high IRQs on WM835x
mfd: Use bulk read to fill WM8350 register cache
mfd: remove duplicated #include from pcf50633
Diffstat (limited to 'drivers/mfd/twl4030-irq.c')
-rw-r--r-- | drivers/mfd/twl4030-irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c index b108760..aca2670 100644 --- a/drivers/mfd/twl4030-irq.c +++ b/drivers/mfd/twl4030-irq.c @@ -182,7 +182,7 @@ static int twl4030_irq_thread(void *data) long irq = (long)data; struct irq_desc *desc = irq_to_desc(irq); static unsigned i2c_errors; - const static unsigned max_i2c_errors = 100; + static const unsigned max_i2c_errors = 100; if (!desc) { pr_err("twl4030: Invalid IRQ: %ld\n", irq); |