git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
[pandora-kernel.git]
/
drivers
/
staging
/
iio
/
accel
/
adis16240_trigger.c
diff --git
a/drivers/staging/iio/accel/adis16240_trigger.c
b/drivers/staging/iio/accel/adis16240_trigger.c
index
2ba71fd
..
6cb8681
100644
(file)
--- a/
drivers/staging/iio/accel/adis16240_trigger.c
+++ b/
drivers/staging/iio/accel/adis16240_trigger.c
@@
-30,7
+30,7
@@
static int adis16240_data_rdy_trig_poll(struct iio_dev *dev_info,
IIO_EVENT_SH(data_rdy_trig, &adis16240_data_rdy_trig_poll);
-static
DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL)
;
+static
IIO_TRIGGER_NAME_ATTR
;
static struct attribute *adis16240_trigger_attrs[] = {
&dev_attr_name.attr,