diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-19 14:31:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-19 14:31:24 -0400 |
| commit | 467999f50ce63197b56fa4eab72e0a8f395388ed (patch) | |
| tree | cb1ffed83309b3231067603d57c4fd36efed85be | |
| parent | 26a9a418237c0b06528941bca693c49c8d97edbe (diff) | |
| parent | 5b4662f098b47f68d7fcea9b065d1513547fef12 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
regulator: da903x: add missing __devexit_p()
| -rw-r--r-- | drivers/regulator/da903x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c index 72b15495183c..c6628f5a0af7 100644 --- a/drivers/regulator/da903x.c +++ b/drivers/regulator/da903x.c | |||
| @@ -497,7 +497,7 @@ static struct platform_driver da903x_regulator_driver = { | |||
| 497 | .owner = THIS_MODULE, | 497 | .owner = THIS_MODULE, |
| 498 | }, | 498 | }, |
| 499 | .probe = da903x_regulator_probe, | 499 | .probe = da903x_regulator_probe, |
| 500 | .remove = da903x_regulator_remove, | 500 | .remove = __devexit_p(da903x_regulator_remove), |
| 501 | }; | 501 | }; |
| 502 | 502 | ||
| 503 | static int __init da903x_regulator_init(void) | 503 | static int __init da903x_regulator_init(void) |