Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / iio / gyro / adis16260.h

diff --git a/drivers/staging/iio/gyro/adis16260.h b/drivers/staging/iio/gyro/adis16260.h
index 812440af57d694eb2893294105691330bd421e6d..c1fd4364287fbd067d8974cdd45589b0391e9934 100644 (file)
--- a/drivers/staging/iio/gyro/adis16260.h
+++ b/drivers/staging/iio/gyro/adis16260.h
@@ -1,5 +1,6 @@
 #ifndef SPI_ADIS16260_H_
 #define SPI_ADIS16260_H_
+#include "adis16260_platform_data.h"
 
 #define ADIS16260_STARTUP_DELAY        220 /* ms */
 
@@ -92,6 +93,7 @@
  * @tx:                        transmit buffer
  * @rx:                        recieve buffer
  * @buf_lock:          mutex to protect tx and rx
+ * @negate:            negate the scale parameter
  **/
 struct adis16260_state {
        struct spi_device               *us;
@@ -102,6 +104,7 @@ struct adis16260_state {
        u8                              *tx;
        u8                              *rx;
        struct mutex                    buf_lock;
+       unsigned                        negate:1;
 };
 
 int adis16260_set_irq(struct device *dev, bool enable);