diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-19 00:08:58 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-19 00:08:58 +0300 |
| commit | 02730d3c053a9af1d402e1c8dc8bbbc5a1340406 (patch) | |
| tree | db289a08de50eb4b5caf7840d5b7356ddfa1c51f /drivers/iio/pressure/hid-sensor-press.c | |
| parent | 77232f791e0605521a978cbe7f79a93df24df374 (diff) | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
| download | linux-02730d3c053a9af1d402e1c8dc8bbbc5a1340406.tar.xz | |
Merge 4.1-rc4 into tty-next
This resolves some tty driver merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/pressure/hid-sensor-press.c')
| -rw-r--r-- | drivers/iio/pressure/hid-sensor-press.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/iio/pressure/hid-sensor-press.c b/drivers/iio/pressure/hid-sensor-press.c index 7bb8d4c1f7df..3cf0bd67d24c 100644 --- a/drivers/iio/pressure/hid-sensor-press.c +++ b/drivers/iio/pressure/hid-sensor-press.c @@ -47,8 +47,6 @@ struct press_state { static const struct iio_chan_spec press_channels[] = { { .type = IIO_PRESSURE, - .modified = 1, - .channel2 = IIO_NO_MOD, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) | BIT(IIO_CHAN_INFO_SCALE) | |