Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / include / linux / pm2301_charger.h

diff --git a/include/linux/pm2301_charger.h b/include/linux/pm2301_charger.h
index fc3f026922ae0eedae497c42ea35123a29561265..85c16defe11ac21d1b4d9c8687fbe99f9ff161af 100644 (file)
--- a/include/linux/pm2301_charger.h
+++ b/include/linux/pm2301_charger.h
@@ -48,7 +48,7 @@ struct pm2xxx_charger_platform_data {
        size_t num_supplicants;
        int i2c_bus;
        const char *label;
-       int irq_number;
+       int gpio_irq_number;
        unsigned int lpn_gpio;
        int irq_type;
 };