1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c
index e5ed52d71937..e5ced3a4c1ed 100644
--- a/drivers/power/z2_battery.c
+++ b/drivers/power/z2_battery.c
@@ -134,6 +134,8 @@ static int z2_batt_ps_init(struct z2_charger *charger, int props)
         enum power_supply_property *prop;
         struct z2_battery_info *info = charger->info;
 
+        if (info->charge_gpio >= 0)
+                props++;        /* POWER_SUPPLY_PROP_STATUS */
         if (info->batt_tech >= 0)
                 props++;        /* POWER_SUPPLY_PROP_TECHNOLOGY */
         if (info->batt_I2C_reg >= 0)
@@ -213,8 +215,8 @@ static int __devinit z2_batt_probe(struct i2c_client *client,
                 if (ret)
                         goto err2;
 
-                set_irq_type(gpio_to_irq(info->charge_gpio),
-                                IRQ_TYPE_EDGE_BOTH);
+                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,
                                 "AC Detect", charger);
@@ -293,6 +295,7 @@ static const struct i2c_device_id z2_batt_id[] = {
         { "aer915", 0 },
         { }
 };
+MODULE_DEVICE_TABLE(i2c, z2_batt_id);
 
 static struct i2c_driver z2_batt_driver = {
         .driver = {