Please sign in to comment.
pinctrl: sirf: fix a bad conflict resolution
Commit 294d135 "pinctrl: sirf: switch to using allocated state container" caused a build conflict due to a bad conflict resolution when cherry-picking the patch. Fix it up. Cc: Barry Song <Baohua.Song@csr.com> Signed-off-by: Linus Walleij <email@example.com>
- Loading branch information...