Merge branches 'core-locking-for-linus' and 'timers-urgent-for-linus' of git://git...

[karo-tx-linux.git] / drivers / power / olpc_battery.c

diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c
index 55b10b81335384f203c3fb91304a86679b93f868..298c47d111b4c53470ad08a5d6fb3db1064a5c7f 100644 (file)
--- a/drivers/power/olpc_battery.c
+++ b/drivers/power/olpc_battery.c
@@ -17,6 +17,7 @@
 #include <linux/power_supply.h>
 #include <linux/jiffies.h>
 #include <linux/sched.h>
+#include <linux/olpc-ec.h>
 #include <asm/olpc.h>
 
 
@@ -597,7 +598,7 @@ static int olpc_battery_suspend(struct platform_device *pdev,
        return 0;
 }
 
-static int __devinit olpc_battery_probe(struct platform_device *pdev)
+static int olpc_battery_probe(struct platform_device *pdev)
 {
        int ret;
        uint8_t status;
@@ -658,7 +659,7 @@ battery_failed:
        return ret;
 }
 
-static int __devexit olpc_battery_remove(struct platform_device *pdev)
+static int olpc_battery_remove(struct platform_device *pdev)
 {
        device_remove_file(olpc_bat.dev, &olpc_bat_error);
        device_remove_bin_file(olpc_bat.dev, &olpc_bat_eeprom);
@@ -680,7 +681,7 @@ static struct platform_driver olpc_battery_driver = {
                .of_match_table = olpc_battery_ids,
        },
        .probe = olpc_battery_probe,
-       .remove = __devexit_p(olpc_battery_remove),
+       .remove = olpc_battery_remove,
        .suspend = olpc_battery_suspend,
 };