From 8deab4754c478149f8a139d6f54dc8b3ff665724 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 22 Sep 2014 07:54:10 -0700
Subject: [PATCH] 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-format-patch failed