From: Linus Walleij <linus.walleij@linaro.org>
Date: Thu, 11 Oct 2012 22:23:02 +0000 (+0200)
Subject: ARM: nomadik: fixup some FSMC merge problems
X-Git-Tag: v3.8-rc1~47^2~84
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db6364a650edcb076786092c7f85f1e1cdae8b20;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed