From: Olof Johansson <olof@lixom.net>
Date: Sat, 22 Sep 2012 18:08:03 +0000 (-0700)
Subject: ARM: tegra: fix mismerges of header file inclusions
X-Git-Tag: v3.7-rc1~38^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=823bba8ff16be79aa5f6480de38fa2fbd3f4ddd5;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed