From: Olof Johansson <olof@lixom.net>
Date: Sat, 22 Sep 2012 18:07:51 +0000 (-0700)
Subject: ARM: iop: fix mismerge of Kconfig
X-Git-Tag: v3.7-rc1~38^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0f72d7cde7e289f45278c4360ce452556ccb9aa;p=pandora-kernel.git

ARM: iop: fix mismerge of Kconfig

I mismerged one of the branches that moves around gpio header file usage,
and messed up for IOP. This fixes the obvious compilation failures caused
by it.

Signed-off-by: Olof Johansson <olof@lixom.net>
---

Reading git-diff-tree failed