diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-02-14 00:23:17 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-02-14 00:23:17 +0100 |
| commit | dce7886e8064d92430bd34e444678f3cd7e3082c (patch) | |
| tree | 4f21d0cd5a86b74371cf500a0fa23b3d58950f40 /drivers/mfd/ab8500-core.c | |
| parent | Documentation: Add docs for max8925 dt (diff) | |
| parent | mfd: ab8500-gpadc: Use new ab8500_gpadc_get() with name parameter (diff) | |
| download | linux-dce7886e8064d92430bd34e444678f3cd7e3082c.tar.xz linux-dce7886e8064d92430bd34e444678f3cd7e3082c.zip | |
Merge branch 'for-mfd' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into for-next
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/ab8500-core.c')
| -rw-r--r-- | drivers/mfd/ab8500-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c index cdcaa5b78c4d..104514228b74 100644 --- a/drivers/mfd/ab8500-core.c +++ b/drivers/mfd/ab8500-core.c @@ -320,6 +320,7 @@ static struct abx500_ops ab8500_ops = { .mask_and_set_register = ab8500_mask_and_set_register, .event_registers_startup_state_get = NULL, .startup_irq_enabled = NULL, + .dump_all_banks = ab8500_dump_all_banks, }; static void ab8500_irq_lock(struct irq_data *data) @@ -521,6 +522,7 @@ static irqreturn_t ab8500_irq(int irq, void *dev) int virq = ab8500_irq_get_virq(ab8500, line); handle_nested_irq(virq); + ab8500_debug_register_interrupt(line); value &= ~(1 << bit); } while (value); |