From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 14 Oct 2011 03:54:07 +0000 (+1100)
Subject: Merge remote-tracking branch 'gpio/gpio/next'
X-Git-Tag: next-20111014~25
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ddba78329481846e367be4c4f15c2d53e570f5c6;p=karo-tx-linux.git

Merge remote-tracking branch 'gpio/gpio/next'
---

ddba78329481846e367be4c4f15c2d53e570f5c6
diff --cc drivers/gpio/gpio-mxc.c
index b588f8a41e60,82f7b65baf72..b81c98992114
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@@ -30,9 -30,8 +30,10 @@@
  #include <linux/of.h>
  #include <linux/of_device.h>
  #include <asm-generic/bug.h>
+ #include <asm/mach/irq.h>
  
 +#define irq_to_gpio(irq)	((irq) - MXC_GPIO_IRQ_START)
 +
  enum mxc_gpio_hwtype {
  	IMX1_GPIO,	/* runs on i.mx1 */
  	IMX21_GPIO,	/* runs on i.mx21 and i.mx27 */