staging: iio: fix up merge error
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Sep 2014 14:54:10 +0000 (07:54 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Sep 2014 14:54:10 +0000 (07:54 -0700)
commit8deab4754c478149f8a139d6f54dc8b3ff665724
tree85e3c6907fce6a83440cce2f7b5e759051966138
parentd84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a
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>
drivers/iio/accel/bma180.c