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>

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);