| commit | 823bba8ff16be79aa5f6480de38fa2fbd3f4ddd5 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sat Sep 22 11:08:03 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Sun Oct 07 07:02:06 2012 -0700 |
| tree | ba2108e91bc53cc39e4cb52b1349b4923f361eca | |
| parent | c0f72d7cde7e289f45278c4360ce452556ccb9aa [diff] |
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>