]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8a5f782) | patch
iio: mxs-lradc: fix merge error
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Mar 2015 13:17:42 +0000 (14:17 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Mar 2015 14:06:49 +0000 (15:06 +0100)
commit608d3348e0abac289a11ce2b650b59eb39f8f967
treef14b02594482a798c4d204fe20af72033dbeae13tree | snapshot
parent8a5f782c33c04ea5c9b3ca6fb32d6039e2e5c0c9commit | diff
iio: mxs-lradc: fix merge error

Commit e7f3db14eacaf1993a70b1517582603dfdf34988 (89bb35e200bee745c539a96666e0792301ca40f1 upstream) was backported incorrectly by me, so fix it up, as the driver is now broken.

Sorry about that.

Reported-by: Kristina Martšenko <kristina.martsenko@gmail.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/iio/adc/mxs-lradc.c diff | blob | blame | history
Michael's Linux tree.