Linus Walleij db6364a650 ARM: nomadik: fixup some FSMC merge problems ... Due to a clash between refactoring and due to loss of a header file that remained in my working tree the Nomadik stopped compiling after switching to the FSMC driver. This patch fixes it up. Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>		2012-11-15 15:37:47 +02:00
..
include/mach	ARM: nomadik: switch over to using the FSMC driver	2012-11-15 15:37:47 +02:00
board-nhk8815.c	ARM: nomadik: fixup some FSMC merge problems	2012-11-15 15:37:47 +02:00
cpu-8815.c	ARM: nomadik: configure Nomadik for pin control	2012-09-03 13:21:37 +02:00
cpu-8815.h	ARM: restart: nomadik: use new restart hook	2012-01-05 12:57:16 +00:00
i2c-8815nhk.c	ARM: nomadik: register all three I2C busses	2012-06-10 18:41:48 +02:00
Kconfig	ARM: config: sort select statements alphanumerically	2012-10-13 17:11:28 +01:00
Makefile	ARM: nomadik: convert to generic clock	2012-06-10 18:41:40 +02:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00