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: NOlof Johansson <olof@lixom.net>