Merge git://git.infradead.org/users/cbou/battery-urgent

This commit is contained in:
Anton Vorontsov 2012-01-10 20:55:11 +04:00
commit 913272b386
452 changed files with 3848 additions and 3320 deletions

View file

@ -146,7 +146,7 @@ static void collie_bat_external_power_changed(struct power_supply *psy)
static irqreturn_t collie_bat_gpio_isr(int irq, void *data)
{
pr_info("collie_bat_gpio irq: %d\n", gpio_get_value(irq_to_gpio(irq)));
pr_info("collie_bat_gpio irq\n");
schedule_work(&bat_work);
return IRQ_HANDLED;
}