Merge tag 'mmc-updates-for-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / arizona-irq.c

diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c
index 64cd9b6dac92df6a425fcbc74eef0f01f153100b..88758ab9402bb914a52d7979c6ab18edca1dc8e2 100644 (file)
--- a/drivers/mfd/arizona-irq.c
+++ b/drivers/mfd/arizona-irq.c
@@ -208,6 +208,14 @@ int arizona_irq_init(struct arizona *arizona)
                ctrlif_error = false;
                break;
 #endif
+#ifdef CONFIG_MFD_WM8997
+       case WM8997:
+               aod = &wm8997_aod;
+               irq = &wm8997_irq;
+
+               ctrlif_error = false;
+               break;
+#endif
        default:
                BUG_ON("Unknown Arizona class device" == NULL);
                return -EINVAL;