git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iio-for-4.5a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...
[sfrench/cifs-2.6.git]
/
drivers
/
iio
/
accel
/
st_accel_core.c
diff --git
a/drivers/iio/accel/st_accel_core.c
b/drivers/iio/accel/st_accel_core.c
index 197a08b4e2f3634ad48af3f246fb855d04f8b12d..70f042797f152a42bff02304987dad0c60d2fd0f 100644
(file)
--- a/
drivers/iio/accel/st_accel_core.c
+++ b/
drivers/iio/accel/st_accel_core.c
@@
-232,6
+232,7
@@
static const struct st_sensor_settings st_accel_sensors_settings[] = {
[3] = LSM330DL_ACCEL_DEV_NAME,
[4] = LSM330DLC_ACCEL_DEV_NAME,
[5] = LSM303AGR_ACCEL_DEV_NAME,
+ [6] = LIS2DH12_ACCEL_DEV_NAME,
},
.ch = (struct iio_chan_spec *)st_accel_12bit_channels,
.odr = {