Merge branch 'next' into for-linus

[pandora-kernel.git] / include / linux / mfd / wm831x / pdata.h

diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h
index 6b0eb13..632d156 100644 (file)
--- a/include/linux/mfd/wm831x/pdata.h
+++ b/include/linux/mfd/wm831x/pdata.h
@@ -106,11 +106,17 @@ struct wm831x_watchdog_pdata {
 #define WM831X_MAX_ISINK  2
 
 struct wm831x_pdata {
+       /** Used to distinguish multiple WM831x chips */
+       int wm831x_num;
+
        /** Called before subdevices are set up */
        int (*pre_init)(struct wm831x *wm831x);
        /** Called after subdevices are set up */
        int (*post_init)(struct wm831x *wm831x);
 
+       /** Put the /IRQ line into CMOS mode */
+       bool irq_cmos;
+
        int irq_base;
        int gpio_base;
        struct wm831x_backlight_pdata *backlight;