diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
| commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
| tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /include/linux/regulator/fixed.h | |
| parent | 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'include/linux/regulator/fixed.h')
| -rw-r--r-- | include/linux/regulator/fixed.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/regulator/fixed.h b/include/linux/regulator/fixed.h index 1387a5d2190e..91b4da31f1b5 100644 --- a/include/linux/regulator/fixed.h +++ b/include/linux/regulator/fixed.h | |||
| @@ -14,9 +14,12 @@ | |||
| 14 | #ifndef __REGULATOR_FIXED_H | 14 | #ifndef __REGULATOR_FIXED_H |
| 15 | #define __REGULATOR_FIXED_H | 15 | #define __REGULATOR_FIXED_H |
| 16 | 16 | ||
| 17 | struct regulator_init_data; | ||
| 18 | |||
| 17 | struct fixed_voltage_config { | 19 | struct fixed_voltage_config { |
| 18 | const char *supply_name; | 20 | const char *supply_name; |
| 19 | int microvolts; | 21 | int microvolts; |
| 22 | struct regulator_init_data *init_data; | ||
| 20 | }; | 23 | }; |
| 21 | 24 | ||
| 22 | #endif | 25 | #endif |