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/mfd/tps65912-spi.c | |
| parent | eba3b670a9166a91be5a11fe33290dca6b9457a2 (diff) | |
| parent | 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf (diff) | |
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/mfd/tps65912-spi.c')
| -rw-r--r-- | drivers/mfd/tps65912-spi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/tps65912-spi.c b/drivers/mfd/tps65912-spi.c index 27d3302d56b..b45f460d299 100644 --- a/drivers/mfd/tps65912-spi.c +++ b/drivers/mfd/tps65912-spi.c @@ -81,7 +81,7 @@ static int tps65912_spi_read(struct tps65912 *tps65912, u8 addr, return ret; } -static int __devinit tps65912_spi_probe(struct spi_device *spi) +static int tps65912_spi_probe(struct spi_device *spi) { struct tps65912 *tps65912; @@ -99,7 +99,7 @@ static int __devinit tps65912_spi_probe(struct spi_device *spi) return tps65912_device_init(tps65912); } -static int __devexit tps65912_spi_remove(struct spi_device *spi) +static int tps65912_spi_remove(struct spi_device *spi) { struct tps65912 *tps65912 = spi_get_drvdata(spi); @@ -114,7 +114,7 @@ static struct spi_driver tps65912_spi_driver = { .owner = THIS_MODULE, }, .probe = tps65912_spi_probe, - .remove = __devexit_p(tps65912_spi_remove), + .remove = tps65912_spi_remove, }; static int __init tps65912_spi_init(void) |