Merge commit 'v2.6.35-rc3' into next

[~andy/linux] / drivers / mfd / 88pm860x-core.c

diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index 21de38daf94819eded79f4ebf42eadab8f1c1981..2c65a2c57294bf00aca078072253ea7d140c94e8 100644 (file)
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -173,6 +173,7 @@ static struct resource regulator_resources[] = {
        PM8607_REG_RESOURCE(LDO9,  LDO9),
        PM8607_REG_RESOURCE(LDO10, LDO10),
        PM8607_REG_RESOURCE(LDO12, LDO12),
+       PM8607_REG_RESOURCE(VIBRATOR_SET, VIBRATOR_SET),
        PM8607_REG_RESOURCE(LDO14, LDO14),
 };
 
@@ -199,6 +200,7 @@ static struct mfd_cell regulator_devs[] = {
        PM8607_REG_DEVS(LDO9),
        PM8607_REG_DEVS(LDO10),
        PM8607_REG_DEVS(LDO12),
+       PM8607_REG_DEVS(LDO13),
        PM8607_REG_DEVS(LDO14),
 };
 
@@ -564,7 +566,7 @@ out:
        return ret;
 }
 
-static void __devexit device_irq_exit(struct pm860x_chip *chip)
+static void device_irq_exit(struct pm860x_chip *chip)
 {
        if (chip->core_irq)
                free_irq(chip->core_irq, chip);
@@ -701,7 +703,7 @@ out:
        return;
 }
 
-int pm860x_device_init(struct pm860x_chip *chip,
+int __devinit pm860x_device_init(struct pm860x_chip *chip,
                       struct pm860x_platform_data *pdata)
 {
        chip->core_irq = 0;
@@ -729,7 +731,7 @@ int pm860x_device_init(struct pm860x_chip *chip,
        return 0;
 }
 
-void pm860x_device_exit(struct pm860x_chip *chip)
+void __devexit pm860x_device_exit(struct pm860x_chip *chip)
 {
        device_irq_exit(chip);
        mfd_remove_devices(chip->dev);