Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-mxc/include/mach/gpio.h between commits 22fe67837614 ("ARM:
gpio: consolidate trivial gpiolib implementations") and 8f3c4537bb08
("ARM: gpio: make trivial GPIOLIB implementation the default") from the
arm tree and commits df1bac2e2f18 ("arm/mxc: use gpiolib helper for
gpio_to_irq"), a4395612290c ("gpio/mxc: move irq_to_gpio() into gpio-mxc
driver") and 1dfa86bb9d3f ("arm/mxc: move IMX_GPIO_NR into
mach/hardware.h") from the arm-soc tree.
I fixed it up (which leaves this file essentially empty - see below) anc
can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/plat-mxc/include/mach/gpio.h
index 3e1ffc8,44af006..0000000
--- a/arch/arm/plat-mxc/include/mach/gpio.h
+++ b/arch/arm/plat-mxc/include/mach/gpio.h
@@@ -21,13 -21,12 +21,5 @@@
#include <linux/spinlock.h>
#include <mach/hardware.h>
-#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
-
- /* There's a off-by-one betweem the gpio bank number and the gpiochip */
- /* range e.g. GPIO_1_5 is gpio 5 under linux */
- #define IMX_GPIO_NR(bank, nr) (((bank) - 1) * 32 + (nr))
-
- #define gpio_to_irq(gpio) (MXC_GPIO_IRQ_START + (gpio))
- #define irq_to_gpio(irq) ((irq) - MXC_GPIO_IRQ_START)
-
#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
