pinctrl: msm: fix up out-of-order merge conflict
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 14 Mar 2014 06:54:20 +0000 (07:54 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 14 Mar 2014 15:32:23 +0000 (16:32 +0100)
commit17cdc926ec08e46af9a8159a6e52fa318f533ed8
tree021fb15f21a35f5b1483562cbe26a7cb6a4e2454
parentbcca9220b211b9668c23c9d8ccb0a3d29716482b
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 <fengguang.wu@intel.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-msm.c