diff options
author | 2012-09-22 11:08:03 -0700 | |
---|---|---|
committer | 2012-10-07 07:02:06 -0700 | |
commit | 823bba8ff16be79aa5f6480de38fa2fbd3f4ddd5 (patch) | |
tree | ba2108e91bc53cc39e4cb52b1349b4923f361eca /tools/perf/scripts/python/export-to-postgresql.py | |
parent | ARM: iop: fix mismerge of Kconfig (diff) | |
download | linux-dev-823bba8ff16be79aa5f6480de38fa2fbd3f4ddd5.tar.xz linux-dev-823bba8ff16be79aa5f6480de38fa2fbd3f4ddd5.zip |
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>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions