diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-22 12:02:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-22 12:02:01 +0100 |
| commit | 43c49938bf72b2862aa12b5d66e710e15ce0f7b7 (patch) | |
| tree | b1a0bb2e280877db1a6391b61717389f51137b4b /include | |
| parent | 4495c08e84729385774601b5146d51d9e5849f81 (diff) | |
| parent | 6985bd5e21901c2d2bfc924b114887e20c002901 (diff) | |
Merge tag 'iio-fixes-for-4.11c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes:
Thirds set of IIO fixes for the 4.11 cycle.
* core
- iio sw-device - ensure configfs is enabled both when building as module
and built in.
* ak8974
- drop incorrect __exit markup on remove.
* hid-sensor-trigger
- code reorganise to avoid losing settings if a power cycle occurs during S3.
* lsm6dsx
- fix incorrect overwrite of parts of FIFO_CTRL2 register during watermark
configuration.
* ti-am335x
- fix a hard to hit bug when reenabling from a fifo overrun by waiting for
current cycle to finish.
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 } |