diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-26 11:02:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-26 11:02:00 -0700 |
| commit | 53b4d5911d6adef3f543e1ad23643068c5c343ac (patch) | |
| tree | 28cf1c9c7fb38406c61f929ee1de07abab9946b4 /include | |
| parent | e431e0e427799805461390df1db1e3478d4c475c (diff) | |
| parent | 43c49938bf72b2862aa12b5d66e710e15ce0f7b7 (diff) | |
| download | linux-53b4d5911d6adef3f543e1ad23643068c5c343ac.tar.bz2 | |
Merge tag 'staging-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull IIO driver fixes from Greg KH:
"Here are some small IIO driver fixes for 4.11-rc4 that resolve a
number of tiny reported issues. All of these have been in linux-next
for a while with no reported issues"
* tag 'staging-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
iio: imu: st_lsm6dsx: fix FIFO_CTRL2 overwrite during watermark configuration
iio: adc: ti_am335x_adc: fix fifo overrun recovery
iio: sw-device: Fix config group initialization
iio: magnetometer: ak8974: remove incorrect __exit markups
iio: hid-sensor-trigger: Change get poll value function order to avoid sensor properties losing after resume from S3
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/iio/sw_device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/iio/sw_device.h b/include/linux/iio/sw_device.h index 23ca41515527..fa7931933067 100644 --- a/include/linux/iio/sw_device.h +++ b/include/linux/iio/sw_device.h @@ -62,7 +62,7 @@ void iio_swd_group_init_type_name(struct iio_sw_device *d, const char *name, struct config_item_type *type) { -#ifdef CONFIG_CONFIGFS_FS +#if IS_ENABLED(CONFIG_CONFIGFS_FS) config_group_init_type_name(&d->group, name, type); #endif } |