diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/linux/rotary_encoder.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'include/linux/rotary_encoder.h')
| -rw-r--r-- | include/linux/rotary_encoder.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/rotary_encoder.h b/include/linux/rotary_encoder.h index 12d63a30c347..215278b8df2a 100644 --- a/include/linux/rotary_encoder.h +++ b/include/linux/rotary_encoder.h | |||
| @@ -8,6 +8,8 @@ struct rotary_encoder_platform_data { | |||
| 8 | unsigned int gpio_b; | 8 | unsigned int gpio_b; |
| 9 | unsigned int inverted_a; | 9 | unsigned int inverted_a; |
| 10 | unsigned int inverted_b; | 10 | unsigned int inverted_b; |
| 11 | bool relative_axis; | ||
| 12 | bool rollover; | ||
| 11 | }; | 13 | }; |
| 12 | 14 | ||
| 13 | #endif /* __ROTARY_ENCODER_H__ */ | 15 | #endif /* __ROTARY_ENCODER_H__ */ |