diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 05:47:46 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 05:47:46 -0500 |
| commit | 41966710ab574f1fcedf3e10e1ceef911c096d1d (patch) | |
| tree | a370f9fb2392267d1e7b06d7c9f43c6d80eb12be /include/linux/regulator/driver.h | |
| parent | 4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (diff) | |
| parent | 1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad (diff) | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'include/linux/regulator/driver.h')
| -rw-r--r-- | include/linux/regulator/driver.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 12a1aa04b720..52c89ae32f64 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #define __LINUX_REGULATOR_DRIVER_H_ | 16 | #define __LINUX_REGULATOR_DRIVER_H_ |
| 17 | 17 | ||
| 18 | #include <linux/device.h> | 18 | #include <linux/device.h> |
| 19 | #include <linux/notifier.h> | ||
| 19 | #include <linux/regulator/consumer.h> | 20 | #include <linux/regulator/consumer.h> |
| 20 | 21 | ||
| 21 | struct regulator_dev; | 22 | struct regulator_dev; |