diff options
author | 2012-09-22 11:07:51 -0700 | |
---|---|---|
committer | 2012-10-07 07:02:06 -0700 | |
commit | c0f72d7cde7e289f45278c4360ce452556ccb9aa (patch) | |
tree | 0259b464e05a38f4cbfdb9c29e70880beef022cc /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm (diff) | |
download | linux-dev-c0f72d7cde7e289f45278c4360ce452556ccb9aa.tar.xz linux-dev-c0f72d7cde7e289f45278c4360ce452556ccb9aa.zip |
ARM: iop: fix mismerge of Kconfig
I mismerged one of the branches that moves around gpio header file usage,
and messed up for IOP. This fixes the obvious compilation failures caused
by it.
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