power_supply: Add charger driver for MAX8998/LP3974

[pandora-kernel.git] / drivers / mfd / max8998.c

diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index bbfe867..de4096a 100644 (file)
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -39,6 +39,8 @@ static struct mfd_cell max8998_devs[] = {
                .name = "max8998-pmic",
        }, {
                .name = "max8998-rtc",
+       }, {
+               .name = "max8998-battery",
        },
 };
 
@@ -209,7 +211,7 @@ static int max8998_suspend(struct device *dev)
        struct max8998_dev *max8998 = i2c_get_clientdata(i2c);
 
        if (max8998->wakeup)
-               set_irq_wake(max8998->irq, 1);
+               irq_set_irq_wake(max8998->irq, 1);
        return 0;
 }
 
@@ -219,7 +221,7 @@ static int max8998_resume(struct device *dev)
        struct max8998_dev *max8998 = i2c_get_clientdata(i2c);
 
        if (max8998->wakeup)
-               set_irq_wake(max8998->irq, 0);
+               irq_set_irq_wake(max8998->irq, 0);
        /*
         * In LP3974, if IRQ registers are not "read & clear"
         * when it's set during sleep, the interrupt becomes
@@ -233,7 +235,7 @@ struct max8998_reg_dump {
        u8      val;
 };
 #define SAVE_ITEM(x)   { .addr = (x), .val = 0x0, }
-struct max8998_reg_dump max8998_dump[] = {
+static struct max8998_reg_dump max8998_dump[] = {
        SAVE_ITEM(MAX8998_REG_IRQM1),
        SAVE_ITEM(MAX8998_REG_IRQM2),
        SAVE_ITEM(MAX8998_REG_IRQM3),
@@ -298,7 +300,7 @@ static int max8998_restore(struct device *dev)
        return 0;
 }
 
-const struct dev_pm_ops max8998_pm = {
+static const struct dev_pm_ops max8998_pm = {
        .suspend = max8998_suspend,
        .resume = max8998_resume,
        .freeze = max8998_freeze,