projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6d7b42a) | 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, 15 Nov 2012 13:37:47 +0000 (15:37 +0200)
commitdb6364a650edcb076786092c7f85f1e1cdae8b20
treef7bd44c6086f7ce768ccef95c27ef6a5145538cftree | snapshot (tar.gz zip)
parent6d7b42a447f92eb3e7e410bbf62042693eb040f7commit | 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 | blame | history