tree f7bd44c6086f7ce768ccef95c27ef6a5145538cf
parent 6d7b42a447f92eb3e7e410bbf62042693eb040f7
author Linus Walleij <linus.walleij@linaro.org> 1349994182 +0200
committer Artem Bityutskiy <artem.bityutskiy@linux.intel.com> 1352986667 +0200

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>