Merge branch 'imx/defconfig' into next/drivers

[karo-tx-linux.git] / drivers / mfd / max8925-core.c

diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index e1e59c92f7588592e141839f2af5c0c4298d53d5..ca881efedf75a43f7543e19d506702ab1518e0ec 100644 (file)
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -210,21 +210,6 @@ static struct max8925_irq_data max8925_irqs[] = {
                .mask_reg       = MAX8925_CHG_IRQ1_MASK,
                .offs           = 1 << 2,
        },
-       [MAX8925_IRQ_VCHG_USB_OVP] = {
-               .reg            = MAX8925_CHG_IRQ1,
-               .mask_reg       = MAX8925_CHG_IRQ1_MASK,
-               .offs           = 1 << 3,
-       },
-       [MAX8925_IRQ_VCHG_USB_F] =  {
-               .reg            = MAX8925_CHG_IRQ1,
-               .mask_reg       = MAX8925_CHG_IRQ1_MASK,
-               .offs           = 1 << 4,
-       },
-       [MAX8925_IRQ_VCHG_USB_R] = {
-               .reg            = MAX8925_CHG_IRQ1,
-               .mask_reg       = MAX8925_CHG_IRQ1_MASK,
-               .offs           = 1 << 5,
-       },
        [MAX8925_IRQ_VCHG_THM_OK_R] = {
                .reg            = MAX8925_CHG_IRQ2,
                .mask_reg       = MAX8925_CHG_IRQ2_MASK,