Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / twl-core.h

diff --git a/drivers/mfd/twl-core.h b/drivers/mfd/twl-core.h
index 8c50a556e9866067eab7ec15c60d5e8736258fe6..00e6468a53b06b262fc2d56013065bea1a0f1b70 100644 (file)
--- a/drivers/mfd/twl-core.h
+++ b/drivers/mfd/twl-core.h
@@ -1,7 +1,8 @@
 #ifndef __TWL_CORE_H__
 #define __TWL_CORE_H__
 
-extern int twl6030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end);
+extern int twl6030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end,
+                       unsigned long features);
 extern int twl6030_exit_irq(void);
 extern int twl4030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end);
 extern int twl4030_exit_irq(void);