OSDN Git Service

gpio: tps65912: fix bad merge
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 9 Mar 2016 15:02:52 +0000 (22:02 +0700)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 9 Mar 2016 15:02:52 +0000 (22:02 +0700)
commit9d93efe35ed011327999675d70bb1b12ccdbd62d
tree619e3a808e227aa9f709aa98c30662c24ac7d1e0
parent70aba44b6cade8dc63261c4f97d5e83b0c02d07a
gpio: tps65912: fix bad merge

I screwed up while merging the immutable branch for TPS65912,
so fixing it unbroken again.

Cc: Lee Jones <lee.jones@linaro.org>
Cc: Andrew F. Davis <afd@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-tps65912.c