diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/linux/rotary_encoder.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/linux/rotary_encoder.h')
| -rw-r--r-- | include/linux/rotary_encoder.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/rotary_encoder.h b/include/linux/rotary_encoder.h index 215278b8df2a..3f594dce5716 100644 --- a/include/linux/rotary_encoder.h +++ b/include/linux/rotary_encoder.h | |||
| @@ -10,6 +10,7 @@ struct rotary_encoder_platform_data { | |||
| 10 | unsigned int inverted_b; | 10 | unsigned int inverted_b; |
| 11 | bool relative_axis; | 11 | bool relative_axis; |
| 12 | bool rollover; | 12 | bool rollover; |
| 13 | bool half_period; | ||
| 13 | }; | 14 | }; |
| 14 | 15 | ||
| 15 | #endif /* __ROTARY_ENCODER_H__ */ | 16 | #endif /* __ROTARY_ENCODER_H__ */ |