diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-03 11:07:29 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-03 11:07:29 -0400 |
| commit | efc33ce197e4b6aaddf1eb2ba6293f51daf3c283 (patch) | |
| tree | 9eaceed3c855d5cbc91c2fc247bdcceafbf28cdf /drivers/regulator/db8500-prcmu.c | |
| parent | 993884f6a26c6547fa3875f9d3fabdc4250d8da6 (diff) | |
| parent | 690a863ff03d9a29ace2b752b8f802fba78a842f (diff) | |
Merge branch 'for-linus' into for-next
Back-merge for cleaning up usb-audio code the recent commit modified,
and further UAC2 autoclock patches.
Diffstat (limited to 'drivers/regulator/db8500-prcmu.c')
| -rw-r--r-- | drivers/regulator/db8500-prcmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/db8500-prcmu.c b/drivers/regulator/db8500-prcmu.c index 219d162b651e..a53c11a529d5 100644 --- a/drivers/regulator/db8500-prcmu.c +++ b/drivers/regulator/db8500-prcmu.c | |||
| @@ -528,7 +528,7 @@ static int db8500_regulator_probe(struct platform_device *pdev) | |||
| 528 | return 0; | 528 | return 0; |
| 529 | } | 529 | } |
| 530 | 530 | ||
| 531 | static int __exit db8500_regulator_remove(struct platform_device *pdev) | 531 | static int db8500_regulator_remove(struct platform_device *pdev) |
| 532 | { | 532 | { |
| 533 | int i; | 533 | int i; |
| 534 | 534 | ||
| @@ -553,7 +553,7 @@ static struct platform_driver db8500_regulator_driver = { | |||
| 553 | .owner = THIS_MODULE, | 553 | .owner = THIS_MODULE, |
| 554 | }, | 554 | }, |
| 555 | .probe = db8500_regulator_probe, | 555 | .probe = db8500_regulator_probe, |
| 556 | .remove = __exit_p(db8500_regulator_remove), | 556 | .remove = db8500_regulator_remove, |
| 557 | }; | 557 | }; |
| 558 | 558 | ||
| 559 | static int __init db8500_regulator_init(void) | 559 | static int __init db8500_regulator_init(void) |