From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 13 Oct 2011 00:23:26 +0000 (+1100)
Subject: Merge remote-tracking branch 'at91/at91-next'
X-Git-Tag: next-20111013~106
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a240289e20f8daae385f465acf5b551defc2b6fe;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/mach-at91/at91sam9g45.c
---

a240289e20f8daae385f465acf5b551defc2b6fe
diff --cc arch/arm/mach-at91/include/mach/gpio.h
index 2b9a1f51210f,5213879ff903..e3fd225121c7
--- a/arch/arm/mach-at91/include/mach/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@@ -214,9 -212,14 +212,9 @@@ extern void at91_gpio_resume(void)
   */
  
  #include <asm/errno.h>
 -#include <asm-generic/gpio.h>		/* cansleep wrappers */
 -
 -#define gpio_get_value	__gpio_get_value
 -#define gpio_set_value	__gpio_set_value
 -#define gpio_cansleep	__gpio_cansleep
  
- #define gpio_to_irq(gpio) (gpio)
- #define irq_to_gpio(irq)  (irq)
+ #define gpio_to_irq(gpio) (gpio + NR_AIC_IRQS)
+ #define irq_to_gpio(irq)  (irq - NR_AIC_IRQS)
  
  #endif	/* __ASSEMBLY__ */