diff --git a/[refs] b/[refs] index 2ab3dadcb2ac..dca707f439bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba6584946e85d477311ddf30a072fbc45572798c +refs/heads/master: 0986452eb49771378f1cabee46c789acb088494c diff --git a/trunk/drivers/staging/iio/ring_generic.h b/trunk/drivers/staging/iio/ring_generic.h index abd52ea93a7b..6975722616fa 100644 --- a/trunk/drivers/staging/iio/ring_generic.h +++ b/trunk/drivers/staging/iio/ring_generic.h @@ -276,7 +276,7 @@ ssize_t iio_scan_el_ts_show(struct device *dev, struct device_attribute *attr, **/ #define IIO_SCAN_EL_TIMESTAMP(number) \ struct iio_scan_el iio_scan_el_timestamp = { \ - .dev_attr = __ATTR(_timestamp_en, \ + .dev_attr = __ATTR(timestamp_en, \ S_IRUGO | S_IWUSR, \ iio_scan_el_ts_show, \ iio_scan_el_ts_store), \