From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 14 Oct 2011 05:09:42 +0000 (+1100)
Subject: Merge remote-tracking branch 'regmap/for-next'
X-Git-Tag: next-20111014~14
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ce127027426dfcd42983ef5833e5050fa39bc6b5;p=karo-tx-linux.git

Merge remote-tracking branch 'regmap/for-next'

Conflicts:
	drivers/mfd/wm831x-spi.c
---

ce127027426dfcd42983ef5833e5050fa39bc6b5
diff --cc include/linux/mfd/wm8994/core.h
index 1478f9875bb3,45df450d869f..f44bdb7273bd
--- a/include/linux/mfd/wm8994/core.h
+++ b/include/linux/mfd/wm8994/core.h
@@@ -57,15 -56,8 +57,10 @@@ struct wm8994 
  	enum wm8994_type type;
  
  	struct device *dev;
- 	int (*read_dev)(struct wm8994 *wm8994, unsigned short reg,
- 			int bytes, void *dest);
- 	int (*write_dev)(struct wm8994 *wm8994, unsigned short reg,
- 			 int bytes, const void *src);
- 
- 	void *control_data;
+ 	struct regmap *regmap;
  
 +	bool ldo_ena_always_driven;
 +
  	int gpio_base;
  	int irq_base;