diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-12 06:10:25 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-12 06:10:25 -0400 |
| commit | 5949a7e9ab2db04edaeee7c368eb4c99131f4629 (patch) | |
| tree | 13e8da5dc42cc62b9721659c41045d2c27c31cc3 /include/linux/mfd | |
| parent | 178e43aef2979525d7864daefd9499614e13800e (diff) | |
| parent | 411a2df5090ccb88f4c3726e4951ebed579fec11 (diff) | |
Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next
Conflicts:
drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4)
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/tps6586x.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mfd/tps6586x.h b/include/linux/mfd/tps6586x.h index b19176eab44d..f350fd0ba1df 100644 --- a/include/linux/mfd/tps6586x.h +++ b/include/linux/mfd/tps6586x.h | |||
| @@ -68,6 +68,7 @@ struct tps6586x_subdev_info { | |||
| 68 | int id; | 68 | int id; |
| 69 | const char *name; | 69 | const char *name; |
| 70 | void *platform_data; | 70 | void *platform_data; |
| 71 | struct device_node *of_node; | ||
| 71 | }; | 72 | }; |
| 72 | 73 | ||
| 73 | struct tps6586x_platform_data { | 74 | struct tps6586x_platform_data { |