Hi Arnd,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-mxs/include/mach/gpio.h between commit 22fe67837614 ("ARM:
gpio: consolidate trivial gpiolib implementations") and later ones from
the arm tree and commit 7e6c53aac38e ("gpio/mxs: move irq_to_gpio() into
gpio-mxs driver") and a579cebd76d8 ("arm/mxs: move MXS_GPIO_NR into
mach/mxs.h") from the arm-soc tree.

I fixed it up (which leaves this file essentailly empty - see below) and
can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-mxs/include/mach/gpio.h
index bb11e63,56025aa..0000000
--- a/arch/arm/mach-mxs/include/mach/gpio.h
+++ b/arch/arm/mach-mxs/include/mach/gpio.h
@@@ -20,8 -20,12 +20,4 @@@
  #ifndef __MACH_MXS_GPIO_H__
  #define __MACH_MXS_GPIO_H__
  
- #define MXS_GPIO_NR(bank, nr)	((bank) * 32 + (nr))
- #define irq_to_gpio(irq)	((irq) - MXS_GPIO_IRQ_START)
- 
 -#include <asm-generic/gpio.h>
 -
 -/* use gpiolib dispatchers */
 -#define gpio_get_value		__gpio_get_value
 -#define gpio_set_value		__gpio_set_value
 -#define gpio_cansleep		__gpio_cansleep
 -#define gpio_to_irq		__gpio_to_irq
 -
  #endif /* __MACH_MXS_GPIO_H__ */