diff --git a/[refs] b/[refs] index e8a699becf0c..85ec7285ae48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fad96ea825e7a8ee0c5b77292b470e4978157ee7 +refs/heads/master: d3901eaf1fc289e8175faa8c7c460d542b6eb7dd diff --git a/trunk/drivers/gpio/gpio-omap.c b/trunk/drivers/gpio/gpio-omap.c index 485b6b207ef9..38beccc9e655 100644 --- a/trunk/drivers/gpio/gpio-omap.c +++ b/trunk/drivers/gpio/gpio-omap.c @@ -576,9 +576,6 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc) enabled = _get_gpio_irqbank_mask(bank); isr_saved = isr = __raw_readl(isr_reg) & enabled; - if (cpu_is_omap15xx() && (bank->method == METHOD_MPUIO)) - isr &= 0x0000ffff; - if (bank->level_mask) level_mask = bank->level_mask & enabled;