diff --git a/[refs] b/[refs] index d7d1a0838273..9e55d3a04ffe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e795a5232e1888d46e22e05677d280a1056ceea +refs/heads/master: 7223234ee02b6ceb9ae07804133d21b9156401e4 diff --git a/trunk/drivers/staging/iio/magnetometer/magnet.h b/trunk/drivers/staging/iio/magnetometer/magnet.h index 64338301f8df..1260eb7bd41e 100644 --- a/trunk/drivers/staging/iio/magnetometer/magnet.h +++ b/trunk/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)