summaryrefslogtreecommitdiffstats
path: root/drivers/power/collie_battery.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 19:22:23 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 20:43:22 +0100
commitc8afa6406e60aec6ff90033e5ffe41a206609296 (patch)
treefc5f696c1b023fc3f045ad36033b1c23e2a786ad /drivers/power/collie_battery.c
parentpower: remove use of __devexit_p (diff)
downloadlinux-c8afa6406e60aec6ff90033e5ffe41a206609296.tar.xz
linux-c8afa6406e60aec6ff90033e5ffe41a206609296.zip
power: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit 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 cd9ef5103d07..d3d80bb84c8f 100644
--- a/drivers/power/collie_battery.c
+++ b/drivers/power/collie_battery.c
@@ -305,7 +305,7 @@ static int collie_bat_resume(struct ucb1x00_dev *dev)
#define collie_bat_resume NULL
#endif
-static int __devinit collie_bat_probe(struct ucb1x00_dev *dev)
+static int collie_bat_probe(struct ucb1x00_dev *dev)
{
int ret;