]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e53ec3d) | 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>
Fri, 9 Nov 2012 15:02:52 +0000 (17:02 +0200)
commiteadd6a19dfc71c13a941b06cda78d08248d19dc1
tree2dc7bb410e4b1bb7cf3b481a0e96421774ef8c20tree | snapshot
parente53ec3d6f977cfd8f76ad1a206050653dd23820ccommit | 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