diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/iio/magnetometer/magnet.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/magnetometer/magnet.h')
-rw-r--r-- | drivers/staging/iio/magnetometer/magnet.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/iio/magnetometer/magnet.h b/drivers/staging/iio/magnetometer/magnet.h index 6433830..1260eb7 100644 --- a/drivers/staging/iio/magnetometer/magnet.h +++ b/drivers/staging/iio/magnetometer/magnet.h @@ -12,14 +12,14 @@ #define IIO_DEV_ATTR_MAGN_Z_OFFSET(_mode, _show, _store, _addr) \ IIO_DEVICE_ATTR(magn_z_offset, _mode, _show, _store, _addr) -#define IIO_DEV_ATTR_MAGN_X_GAIN(_mode, _show, _store, _addr) \ - IIO_DEVICE_ATTR(magn_x_gain, _mode, _show, _store, _addr) +#define IIO_DEV_ATTR_MAGN_X_SCALE(_mode, _show, _store, _addr) \ + IIO_DEVICE_ATTR(magn_x_scale, _mode, _show, _store, _addr) -#define IIO_DEV_ATTR_MAGN_Y_GAIN(_mode, _show, _store, _addr) \ - IIO_DEVICE_ATTR(magn_y_gain, _mode, _show, _store, _addr) +#define IIO_DEV_ATTR_MAGN_Y_SCALE(_mode, _show, _store, _addr) \ + IIO_DEVICE_ATTR(magn_y_scale, _mode, _show, _store, _addr) -#define IIO_DEV_ATTR_MAGN_Z_GAIN(_mode, _show, _store, _addr) \ - IIO_DEVICE_ATTR(magn_z_gain, _mode, _show, _store, _addr) +#define IIO_DEV_ATTR_MAGN_Z_SCALE(_mode, _show, _store, _addr) \ + IIO_DEVICE_ATTR(magn_z_scale, _mode, _show, _store, _addr) #define IIO_DEV_ATTR_MAGN_X(_show, _addr) \ IIO_DEVICE_ATTR(magn_x_raw, S_IRUGO, _show, NULL, _addr) |