diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-19 14:17:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-26 15:06:49 +0100 |
| commit | 608d3348e0abac289a11ce2b650b59eb39f8f967 (patch) | |
| tree | f14b02594482a798c4d204fe20af72033dbeae13 /arch | |
| parent | 8a5f782c33c04ea5c9b3ca6fb32d6039e2e5c0c9 (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>
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions