git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0e51793) | patch
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)
commitc0f72d7cde7e289f45278c4360ce452556ccb9aa
tree0259b464e05a38f4cbfdb9c29e70880beef022cctree
parent0e51793e162ca432fc5f04178cf82b80a92c2659commit | diff
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>
arch/arm/Kconfig diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.