Diff
Modified: trunk/drivers/staging/iio/accel/adis16209_core.c (8678 => 8679)
--- trunk/drivers/staging/iio/accel/adis16209_core.c 2010-04-29 08:12:05 UTC (rev 8678)
+++ trunk/drivers/staging/iio/accel/adis16209_core.c 2010-04-29 08:31:15 UTC (rev 8679)
@@ -22,7 +22,7 @@
#include "../sysfs.h"
#include "accel.h"
#include "../imu/volt.h"
-#include "../imu/gyro.h"
+#include "../gyro/gyro.h"
#include "../adc/adc.h"
#include "adis16209.h"
Modified: trunk/drivers/staging/iio/gyro/adis16060_core.c (8678 => 8679)
--- trunk/drivers/staging/iio/gyro/adis16060_core.c 2010-04-29 08:12:05 UTC (rev 8678)
+++ trunk/drivers/staging/iio/gyro/adis16060_core.c 2010-04-29 08:31:15 UTC (rev 8679)
@@ -20,7 +20,7 @@
#include "../iio.h"
#include "../sysfs.h"
-#include "../imu/gyro.h"
+#include "gyro.h"
#include "../adc/adc.h"
#include "adis16060.h"
Modified: trunk/drivers/staging/iio/gyro/adis16080_core.c (8678 => 8679)
--- trunk/drivers/staging/iio/gyro/adis16080_core.c 2010-04-29 08:12:05 UTC (rev 8678)
+++ trunk/drivers/staging/iio/gyro/adis16080_core.c 2010-04-29 08:31:15 UTC (rev 8679)
@@ -20,7 +20,7 @@
#include "../iio.h"
#include "../sysfs.h"
-#include "../imu/gyro.h"
+#include "gyro.h"
#include "../adc/adc.h"
#include "adis16080.h"
Modified: trunk/drivers/staging/iio/gyro/adis16130_core.c (8678 => 8679)
--- trunk/drivers/staging/iio/gyro/adis16130_core.c 2010-04-29 08:12:05 UTC (rev 8678)
+++ trunk/drivers/staging/iio/gyro/adis16130_core.c 2010-04-29 08:31:15 UTC (rev 8679)
@@ -20,7 +20,7 @@
#include "../iio.h"
#include "../sysfs.h"
-#include "../imu/gyro.h"
+#include "gyro.h"
#include "../adc/adc.h"
#include "adis16130.h"
Modified: trunk/drivers/staging/iio/gyro/adis16260_core.c (8678 => 8679)
--- trunk/drivers/staging/iio/gyro/adis16260_core.c 2010-04-29 08:12:05 UTC (rev 8678)
+++ trunk/drivers/staging/iio/gyro/adis16260_core.c 2010-04-29 08:31:15 UTC (rev 8679)
@@ -20,7 +20,7 @@
#include "../iio.h"
#include "../sysfs.h"
-#include "../imu/gyro.h"
+#include "gyro.h"
#include "../imu/volt.h"
#include "adis16260.h"
Modified: trunk/drivers/staging/iio/gyro/adis16261_core.c (8678 => 8679)
--- trunk/drivers/staging/iio/gyro/adis16261_core.c 2010-04-29 08:12:05 UTC (rev 8678)
+++ trunk/drivers/staging/iio/gyro/adis16261_core.c 2010-04-29 08:31:15 UTC (rev 8679)
@@ -20,7 +20,7 @@
#include "../iio.h"
#include "../sysfs.h"
-#include "../imu/gyro.h"
+#include "gyro.h"
#include "../imu/volt.h"
#include "adis16261.h"
Copied: trunk/drivers/staging/iio/gyro/gyro.h (from rev 8678, trunk/drivers/staging/iio/imu/gyro.h) (0 => 8679)
--- trunk/drivers/staging/iio/gyro/gyro.h (rev 0)
+++ trunk/drivers/staging/iio/gyro/gyro.h 2010-04-29 08:31:15 UTC (rev 8679)
@@ -0,0 +1,76 @@
+
+#include "../sysfs.h"
+
+/* Gyroscope types of attribute */
+
+#define IIO_DEV_ATTR_GYRO_OFFSET(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(gyro_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_GYRO_X_OFFSET(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(gyro_x_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_GYRO_Y_OFFSET(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(gyro_y_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_GYRO_Z_OFFSET(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(gyro_z_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_GYRO_X_GAIN(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(gyro_x_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_GYRO_Y_GAIN(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(gyro_y_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_GYRO_Z_GAIN(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(gyro_z_gain, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_GYRO_SCALE(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(gyro_scale, S_IRUGO, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_GYRO(_show, _addr) \
+ IIO_DEVICE_ATTR(gyro, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_GYRO_X(_show, _addr) \
+ IIO_DEVICE_ATTR(gyro_x, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_GYRO_Y(_show, _addr) \
+ IIO_DEVICE_ATTR(gyro_y, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_GYRO_Z(_show, _addr) \
+ IIO_DEVICE_ATTR(gyro_z, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_TEMP_X(_show, _addr) \
+ IIO_DEVICE_ATTR(temp_x, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_TEMP_Y(_show, _addr) \
+ IIO_DEVICE_ATTR(temp_y, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_TEMP_Z(_show, _addr) \
+ IIO_DEVICE_ATTR(temp_z, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_INCLI_X(_show, _addr) \
+ IIO_DEVICE_ATTR(incli_x, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_INCLI_Y(_show, _addr) \
+ IIO_DEVICE_ATTR(incli_y, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_INCLI_Z(_show, _addr) \
+ IIO_DEVICE_ATTR(incli_z, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_INCLI_X_OFFSET(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(incli_x_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_INCLI_Y_OFFSET(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(incli_y_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_INCLI_Z_OFFSET(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(incli_z_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_ROT(_show, _addr) \
+ IIO_DEVICE_ATTR(rot, S_IRUGO, _show, NULL, _addr)
+
+#define IIO_DEV_ATTR_ROT_OFFSET(_mode, _show, _store, _addr) \
+ IIO_DEVICE_ATTR(rot_offset, _mode, _show, _store, _addr)
+
+#define IIO_DEV_ATTR_ANGL(_show, _addr) \
+ IIO_DEVICE_ATTR(angl, S_IRUGO, _show, NULL, _addr)
Property changes: trunk/drivers/staging/iio/gyro/gyro.h
Added: svn:mergeinfo
Modified: trunk/drivers/staging/iio/imu/adis16300_core.c (8678 => 8679)
--- trunk/drivers/staging/iio/imu/adis16300_core.c 2010-04-29 08:12:05 UTC (rev 8678)
+++ trunk/drivers/staging/iio/imu/adis16300_core.c 2010-04-29 08:31:15 UTC (rev 8679)
@@ -21,7 +21,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../accel/accel.h"
-#include "gyro.h"
+#include "../gyro/gyro.h"
#include "volt.h"
#include "adis16300.h"
Modified: trunk/drivers/staging/iio/imu/adis16350_core.c (8678 => 8679)
--- trunk/drivers/staging/iio/imu/adis16350_core.c 2010-04-29 08:12:05 UTC (rev 8678)
+++ trunk/drivers/staging/iio/imu/adis16350_core.c 2010-04-29 08:31:15 UTC (rev 8679)
@@ -21,7 +21,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../accel/accel.h"
-#include "gyro.h"
+#include "../gyro/gyro.h"
#include "volt.h"
#include "adis16350.h"
Modified: trunk/drivers/staging/iio/imu/adis16400_core.c (8678 => 8679)
--- trunk/drivers/staging/iio/imu/adis16400_core.c 2010-04-29 08:12:05 UTC (rev 8678)
+++ trunk/drivers/staging/iio/imu/adis16400_core.c 2010-04-29 08:31:15 UTC (rev 8679)
@@ -28,7 +28,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../accel/accel.h"
-#include "gyro.h"
+#include "../gyro/gyro.h"
#include "magnet.h"
#include "volt.h"
Deleted: trunk/drivers/staging/iio/imu/gyro.h (8678 => 8679)
--- trunk/drivers/staging/iio/imu/gyro.h 2010-04-29 08:12:05 UTC (rev 8678)
+++ trunk/drivers/staging/iio/imu/gyro.h 2010-04-29 08:31:15 UTC (rev 8679)
@@ -1,76 +0,0 @@
-
-#include "../sysfs.h"
-
-/* Gyroscope types of attribute */
-
-#define IIO_DEV_ATTR_GYRO_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_X_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_x_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Y_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_y_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Z_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_z_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_X_GAIN(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_x_gain, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Y_GAIN(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_y_gain, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Z_GAIN(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_z_gain, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_SCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_scale, S_IRUGO, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO(_show, _addr) \
- IIO_DEVICE_ATTR(gyro, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_GYRO_X(_show, _addr) \
- IIO_DEVICE_ATTR(gyro_x, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Y(_show, _addr) \
- IIO_DEVICE_ATTR(gyro_y, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Z(_show, _addr) \
- IIO_DEVICE_ATTR(gyro_z, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_TEMP_X(_show, _addr) \
- IIO_DEVICE_ATTR(temp_x, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_TEMP_Y(_show, _addr) \
- IIO_DEVICE_ATTR(temp_y, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_TEMP_Z(_show, _addr) \
- IIO_DEVICE_ATTR(temp_z, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_INCLI_X(_show, _addr) \
- IIO_DEVICE_ATTR(incli_x, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_INCLI_Y(_show, _addr) \
- IIO_DEVICE_ATTR(incli_y, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_INCLI_Z(_show, _addr) \
- IIO_DEVICE_ATTR(incli_z, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_INCLI_X_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(incli_x_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_INCLI_Y_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(incli_y_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_INCLI_Z_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(incli_z_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ROT(_show, _addr) \
- IIO_DEVICE_ATTR(rot, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ROT_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(rot_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ANGL(_show, _addr) \
- IIO_DEVICE_ATTR(angl, S_IRUGO, _show, NULL, _addr)