diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-06-29 08:45:58 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-06-29 08:45:58 -0400 |
| commit | 59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266 (patch) | |
| tree | b913718405d44a921905ac71044fbde410256865 /include/linux/mfd/wm8994/core.h | |
| parent | 57bdfdd80077addf518a9b90c4a66890efc4f70e (diff) | |
| parent | 89abfab133ef1f5902abafb744df72793213ac19 (diff) | |
Merge branch 'master' into for-next
Conflicts:
include/linux/mmzone.h
Synced with Linus' tree so that trivial patch can be applied
on top of up-to-date code properly.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'include/linux/mfd/wm8994/core.h')
| -rw-r--r-- | include/linux/mfd/wm8994/core.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mfd/wm8994/core.h b/include/linux/mfd/wm8994/core.h index 6695c3ec4518..1f173306bf05 100644 --- a/include/linux/mfd/wm8994/core.h +++ b/include/linux/mfd/wm8994/core.h | |||
| @@ -57,6 +57,7 @@ struct wm8994 { | |||
| 57 | 57 | ||
| 58 | enum wm8994_type type; | 58 | enum wm8994_type type; |
| 59 | int revision; | 59 | int revision; |
| 60 | int cust_id; | ||
| 60 | 61 | ||
| 61 | struct device *dev; | 62 | struct device *dev; |
| 62 | struct regmap *regmap; | 63 | struct regmap *regmap; |