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/hwmon/twl4030-madc-hwmon.c | |
| parent | eba3b670a9166a91be5a11fe33290dca6b9457a2 (diff) | |
| parent | 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf (diff) | |
| download | lwn-76d8a23b127020472207b281427d3e9f4f1227e4.tar.gz lwn-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/hwmon/twl4030-madc-hwmon.c')
| -rw-r--r-- | drivers/hwmon/twl4030-madc-hwmon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/twl4030-madc-hwmon.c b/drivers/hwmon/twl4030-madc-hwmon.c index 1a174f0a3cde..149d44a7c584 100644 --- a/drivers/hwmon/twl4030-madc-hwmon.c +++ b/drivers/hwmon/twl4030-madc-hwmon.c @@ -96,7 +96,7 @@ static const struct attribute_group twl4030_madc_group = { .attrs = twl4030_madc_attributes, }; -static int __devinit twl4030_madc_hwmon_probe(struct platform_device *pdev) +static int twl4030_madc_hwmon_probe(struct platform_device *pdev) { int ret; struct device *hwmon; @@ -120,7 +120,7 @@ err_sysfs: return ret; } -static int __devexit twl4030_madc_hwmon_remove(struct platform_device *pdev) +static int twl4030_madc_hwmon_remove(struct platform_device *pdev) { hwmon_device_unregister(&pdev->dev); sysfs_remove_group(&pdev->dev.kobj, &twl4030_madc_group); |