tree ba2108e91bc53cc39e4cb52b1349b4923f361eca
parent c0f72d7cde7e289f45278c4360ce452556ccb9aa
author Olof Johansson <olof@lixom.net> 1348337283 -0700
committer Olof Johansson <olof@lixom.net> 1349618526 -0700

ARM: tegra: fix mismerges of header file inclusions

Another mishandled merge conflict by me, where the header file renames
and the removal of gpio includes clashed and I chose the wrong end result.

Fixes build breakage for tegra_defconfig.

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