ASoC: core: Add support for DAI and machine kcontrols.

[deliverable/linux.git] / drivers / power / z2_battery.c

diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c
index d119c38b3ff632ef158f66a971799c522202c6a3..636ebb2a0e807bd44e28f902200cabdf16e399b9 100644 (file)
--- a/drivers/power/z2_battery.c
+++ b/drivers/power/z2_battery.c
@@ -218,7 +218,7 @@ static int __devinit z2_batt_probe(struct i2c_client *client,
                irq_set_irq_type(gpio_to_irq(info->charge_gpio),
                                 IRQ_TYPE_EDGE_BOTH);
                ret = request_irq(gpio_to_irq(info->charge_gpio),
-                               z2_charge_switch_irq, IRQF_DISABLED,
+                               z2_charge_switch_irq, 0,
                                "AC Detect", charger);
                if (ret)
                        goto err3;
@@ -313,7 +313,7 @@ static struct i2c_driver z2_batt_driver = {
                .pm     = Z2_BATTERY_PM_OPS
        },
        .probe          = z2_batt_probe,
-       .remove         = z2_batt_remove,
+       .remove         = __devexit_p(z2_batt_remove),
        .id_table       = z2_batt_id,
 };