diff options
| author | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-12-11 22:15:57 -0800 |
|---|---|---|
| committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-12-11 22:15:57 -0800 |
| commit | 76d8a23b127020472207b281427d3e9f4f1227e4 (patch) | |
| tree | e14d7063d96d850fb259115d6fb08cbeb98ccf88 /drivers/video/backlight/ld9040.c | |
| parent | eba3b670a9166a91be5a11fe33290dca6b9457a2 (diff) | |
| parent | 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf (diff) | |
| download | talos-obmc-linux-76d8a23b127020472207b281427d3e9f4f1227e4.tar.gz talos-obmc-linux-76d8a23b127020472207b281427d3e9f4f1227e4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
The merge is merely to fix conflicts before sending a pull request.
Conflicts:
drivers/power/ab8500_btemp.c
drivers/power/ab8500_charger.c
drivers/power/ab8500_fg.c
drivers/power/abx500_chargalg.c
drivers/power/max8925_power.c
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/video/backlight/ld9040.c')
| -rw-r--r-- | drivers/video/backlight/ld9040.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/backlight/ld9040.c b/drivers/video/backlight/ld9040.c index 58f517fb7d40..1cb352418513 100644 --- a/drivers/video/backlight/ld9040.c +++ b/drivers/video/backlight/ld9040.c @@ -788,7 +788,7 @@ out_free_regulator: return ret; } -static int __devexit ld9040_remove(struct spi_device *spi) +static int ld9040_remove(struct spi_device *spi) { struct ld9040 *lcd = dev_get_drvdata(&spi->dev); @@ -847,7 +847,7 @@ static struct spi_driver ld9040_driver = { .owner = THIS_MODULE, }, .probe = ld9040_probe, - .remove = __devexit_p(ld9040_remove), + .remove = ld9040_remove, .shutdown = ld9040_shutdown, .suspend = ld9040_suspend, .resume = ld9040_resume, |
