diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-01-22 04:03:02 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-01-22 04:03:02 -0500 |
| commit | 6552ebae25ffd57574c6e72d17fce67fea08b918 (patch) | |
| tree | cde6cc932c7e47d818154b011dfd8a6997d5c18e /drivers/regulator | |
| parent | 749a440b2218e9937dca8c68e23e51ca4d8d37fe (diff) | |
| parent | 336f6c322d87806ef93afad6308ac65083a865e5 (diff) | |
Merge branch 'core/debugobjects' into core/urgent
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/wm8400-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c index 48b372e038a8..56e23d44ba59 100644 --- a/drivers/regulator/wm8400-regulator.c +++ b/drivers/regulator/wm8400-regulator.c | |||
| @@ -289,7 +289,7 @@ static struct regulator_desc regulators[] = { | |||
| 289 | }, | 289 | }, |
| 290 | }; | 290 | }; |
| 291 | 291 | ||
| 292 | static int __init wm8400_regulator_probe(struct platform_device *pdev) | 292 | static int __devinit wm8400_regulator_probe(struct platform_device *pdev) |
| 293 | { | 293 | { |
| 294 | struct regulator_dev *rdev; | 294 | struct regulator_dev *rdev; |
| 295 | 295 | ||