From 54707d2a59479a3c2c4d7a4d4ce8f5722b652e2c Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Tue, 21 Sep 2010 14:41:07 +0100 Subject: [PATCH] --- yaml --- r: 219936 b: refs/heads/master c: 3215e31cc30cecdc4465bd1c5f36e1e898e686a1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/ring_generic.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 622b369426ab..6f5dbb5d3b21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d16061bb6713844358abe87c82a23775ee1dd528 +refs/heads/master: 3215e31cc30cecdc4465bd1c5f36e1e898e686a1 diff --git a/trunk/drivers/staging/iio/ring_generic.h b/trunk/drivers/staging/iio/ring_generic.h index 1daeb01b43f8..abd52ea93a7b 100644 --- a/trunk/drivers/staging/iio/ring_generic.h +++ b/trunk/drivers/staging/iio/ring_generic.h @@ -236,7 +236,7 @@ ssize_t iio_scan_el_ts_show(struct device *dev, struct device_attribute *attr, **/ #define __IIO_SCAN_EL_C(_name, _number, _label, _controlfunc) \ struct iio_scan_el iio_scan_el_##_name = { \ - .dev_attr = __ATTR(_number##_##_name##_en, \ + .dev_attr = __ATTR(_name##_en, \ S_IRUGO | S_IWUSR, \ iio_scan_el_show, \ iio_scan_el_store), \ @@ -251,7 +251,7 @@ ssize_t iio_scan_el_ts_show(struct device *dev, struct device_attribute *attr, #define __IIO_SCAN_NAMED_EL_C(_name, _string, _number, _label, _cf) \ struct iio_scan_el iio_scan_el_##_name = { \ - .dev_attr = __ATTR(_number##_##_string##_en, \ + .dev_attr = __ATTR(_string##_en, \ S_IRUGO | S_IWUSR, \ iio_scan_el_show, \ iio_scan_el_store), \ @@ -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(number##_timestamp_en, \ + .dev_attr = __ATTR(_timestamp_en, \ S_IRUGO | S_IWUSR, \ iio_scan_el_ts_show, \ iio_scan_el_ts_store), \