git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0e51793)
ARM: iop: fix mismerge of Kconfig
authorOlof Johansson <olof@lixom.net>
Sat, 22 Sep 2012 18:07:51 +0000 (11:07 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 7 Oct 2012 14:02:06 +0000 (07:02 -0700)
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>
arch/arm/Kconfig patch | blob | history

diff --cc arch/arm/Kconfig
Simple merge
Pandora Kernel Repository