aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/collie_battery.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:20:40 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 11:43:22 -0800
commit28ea73f4c67cb3dd8c972b21d9fdf84ea78d6daa (patch)
tree36940d50c00ec43a6d7dafc8fd27429601168fb7 /drivers/power/collie_battery.c
parenthwspinlock: remove use of __devexit (diff)
downloadlinux-dev-28ea73f4c67cb3dd8c972b21d9fdf84ea78d6daa.tar.xz
linux-dev-28ea73f4c67cb3dd8c972b21d9fdf84ea78d6daa.zip
power: remove use of __devexit_p
CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Anton Vorontsov <cbou@mail.ru> Cc: David Woodhouse <dwmw2@infradead.org> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/power/collie_battery.c')
-rw-r--r--drivers/power/collie_battery.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c
index b19bfe400f8c..cd9ef5103d07 100644
--- a/drivers/power/collie_battery.c
+++ b/drivers/power/collie_battery.c
@@ -367,7 +367,7 @@ static void __devexit collie_bat_remove(struct ucb1x00_dev *dev)
static struct ucb1x00_driver collie_bat_driver = {
.add = collie_bat_probe,
- .remove = __devexit_p(collie_bat_remove),
+ .remove = collie_bat_remove,
.suspend = collie_bat_suspend,
.resume = collie_bat_resume,
};