From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 22 Sep 2014 14:54:10 +0000 (-0700)
Subject: staging: iio: fix up merge error
X-Git-Tag: fixes-for-v3.18-merge-window~15^2~303
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8deab4754c478149f8a139d6f54dc8b3ff665724;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed