diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-01 11:52:36 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-01 11:52:36 +1000 |
| commit | 739233d541de91f9ef64d48dd1b573ccbb8aa3c2 (patch) | |
| tree | a852315b2aa98035acfaf624801d4edf00cf3f3e /drivers/staging/iio/accel/sca3000_core.c | |
| parent | b235f554105c08a1b61b4cc539a3a1d41451dfad (diff) | |
| parent | 9b9913d80b2896ecd9e0a1a8f167ccad66fac79c (diff) | |
Merge remote branch 'staging-next/staging-next'
Diffstat (limited to 'drivers/staging/iio/accel/sca3000_core.c')
| -rw-r--r-- | drivers/staging/iio/accel/sca3000_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c index b78b6b66ffe0..0eb2c4cdeb48 100644 --- a/drivers/staging/iio/accel/sca3000_core.c +++ b/drivers/staging/iio/accel/sca3000_core.c @@ -721,8 +721,8 @@ error_ret: } static IIO_DEV_ATTR_TEMP_RAW(sca3000_read_temp); -static IIO_CONST_ATTR(temp_scale, "0.555556"); -static IIO_CONST_ATTR(temp_offset, "-214.6"); +static IIO_CONST_ATTR_TEMP_SCALE("0.555556"); +static IIO_CONST_ATTR_TEMP_OFFSET("-214.6"); /** * sca3000_show_thresh() sysfs query of a threshold |