diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-02 19:20:59 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-02 19:20:59 -0500 |
| commit | deef2a118aed02aa9421e399056c82045e728282 (patch) | |
| tree | ffd415cb12df4d1afba0a5f9f37bf17dc3f5e86f /include/linux/iio | |
| parent | aa9d9be96d33d97488e1bdf13a144931a3fce08e (diff) | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a (diff) | |
Merge 3.18-rc7 into staging-work.
We want those staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/iio')
| -rw-r--r-- | include/linux/iio/events.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/iio/events.h b/include/linux/iio/events.h index 8bbd7bc1043d..03fa332ad2a8 100644 --- a/include/linux/iio/events.h +++ b/include/linux/iio/events.h | |||
| @@ -72,7 +72,7 @@ struct iio_event_data { | |||
| 72 | 72 | ||
| 73 | #define IIO_EVENT_CODE_EXTRACT_TYPE(mask) ((mask >> 56) & 0xFF) | 73 | #define IIO_EVENT_CODE_EXTRACT_TYPE(mask) ((mask >> 56) & 0xFF) |
| 74 | 74 | ||
| 75 | #define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0xCF) | 75 | #define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0x7F) |
| 76 | 76 | ||
| 77 | #define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF) | 77 | #define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF) |
| 78 | 78 | ||