Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6

[~andy/linux] / include / linux / mfd / wm831x / core.h

diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h
index 272f7fb5f8b897a761fc2b0764000302f46a4847..4b1211859f74a9dad29a555c758b868e29a392d1 100644 (file)
--- a/include/linux/mfd/wm831x/core.h
+++ b/include/linux/mfd/wm831x/core.h
@@ -18,6 +18,7 @@
 #include <linux/completion.h>
 #include <linux/interrupt.h>
 #include <linux/list.h>
+#include <linux/regmap.h>
 
 /*
  * Register values.
@@ -361,12 +362,8 @@ struct wm831x {
        struct mutex io_lock;
 
        struct device *dev;
-       int (*read_dev)(struct wm831x *wm831x, unsigned short reg,
-                       int bytes, void *dest);
-       int (*write_dev)(struct wm831x *wm831x, unsigned short reg,
-                        int bytes, void *src);
 
-       void *control_data;
+       struct regmap *regmap;
 
        int irq;  /* Our chip IRQ */
        struct mutex irq_lock;
@@ -420,4 +417,6 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq);
 void wm831x_irq_exit(struct wm831x *wm831x);
 void wm831x_auxadc_init(struct wm831x *wm831x);
 
+extern struct regmap_config wm831x_regmap_config;
+
 #endif