diff options
| author | Linus Walleij <[email protected]> | 2014-03-14 07:54:20 +0100 |
|---|---|---|
| committer | Linus Walleij <[email protected]> | 2014-03-14 16:32:23 +0100 |
| commit | 17cdc926ec08e46af9a8159a6e52fa318f533ed8 (patch) | |
| tree | 021fb15f21a35f5b1483562cbe26a7cb6a4e2454 /tools/perf/util/python.c | |
| parent | bcca9220b211b9668c23c9d8ccb0a3d29716482b (diff) | |
pinctrl: msm: fix up out-of-order merge conflict
Commit 051a58b4622f0e1b732acb750097c64bc00ddb93
"pinctrl: msm: Simplify msm_config_reg() and callers"
removed the local "reg" variable in the msm_config_reg()
function, but the earlier
commit ed118a5fd951bd2def8249ee251842c4f81fe4bd
"pinctrl-msm: Support output-{high,low} configuration"
introduced a new switchclause using it.
Fix this up by removing the offending register assignment.
Reported-by: Kbuild test robot <[email protected]>
Cc: Stephen Boyd <[email protected]>
Acked-by: Bjorn Andersson <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>
Diffstat (limited to 'tools/perf/util/python.c')
0 files changed, 0 insertions, 0 deletions