Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[~andy/linux] / include / linux / rotary_encoder.h

diff --git a/include/linux/rotary_encoder.h b/include/linux/rotary_encoder.h
index 12d63a30c34736e3567321c2924c51999c9fa98e..215278b8df2aba5ca56f5eef120ef7b782523da6 100644 (file)
--- a/include/linux/rotary_encoder.h
+++ b/include/linux/rotary_encoder.h
@@ -8,6 +8,8 @@ struct rotary_encoder_platform_data {
        unsigned int gpio_b;
        unsigned int inverted_a;
        unsigned int inverted_b;
+       bool relative_axis;
+       bool rollover;
 };
 
 #endif /* __ROTARY_ENCODER_H__ */