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

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

diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c
index 3e23f43e98af5813462a83c06de11fefe9eaaef0..14e2b96d93b0f8eb43cc78379804cfe818bf9049 100644 (file)
--- a/drivers/power/max8903_charger.c
+++ b/drivers/power/max8903_charger.c
@@ -179,7 +179,7 @@ static irqreturn_t max8903_fault(int irq, void *_data)
        return IRQ_HANDLED;
 }
 
-static __devinit int max8903_probe(struct platform_device *pdev)
+static int max8903_probe(struct platform_device *pdev)
 {
        struct max8903_data *data;
        struct device *dev = &pdev->dev;
@@ -345,7 +345,7 @@ err:
        return ret;
 }
 
-static __devexit int max8903_remove(struct platform_device *pdev)
+static int max8903_remove(struct platform_device *pdev)
 {
        struct max8903_data *data = platform_get_drvdata(pdev);
 
@@ -367,7 +367,7 @@ static __devexit int max8903_remove(struct platform_device *pdev)
 
 static struct platform_driver max8903_driver = {
        .probe  = max8903_probe,
-       .remove = __devexit_p(max8903_remove),
+       .remove = max8903_remove,
        .driver = {
                .name   = "max8903-charger",
                .owner  = THIS_MODULE,