]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 95bda19) | patch
ARM: nomadik: fixup some FSMC merge problems
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 11 Oct 2012 22:23:02 +0000 (00:23 +0200)
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Thu, 18 Oct 2012 09:22:55 +0000 (12:22 +0300)
commitd0bc4713119a4096a8d55a37b206d587e58c567c
tree582ddd2c33e0360b93fbc0e1fc10792301edff9dtree | snapshot
parent95bda19e5529d5c2d121781a61881aadda4b4067commit | diff
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>
arch/arm/mach-nomadik/board-nhk8815.c diff | blob | history
Linux kernel for KaRo TX COM modules