| commit | 8deab4754c478149f8a139d6f54dc8b3ff665724 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Sep 22 07:54:10 2014 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Sep 22 07:54:10 2014 -0700 |
| tree | 85e3c6907fce6a83440cce2f7b5e759051966138 | |
| parent | d84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a [diff] |
staging: iio: fix up merge error Fix up a build merge error in drivers/iio/accel/bma180.c that I caused. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>