Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

[mv-sheeva.git] / include / linux / lis3lv02d.h

diff --git a/include/linux/lis3lv02d.h b/include/linux/lis3lv02d.h
index ad651f4e45acb8ce36dedff46e9b55784fa4d963..3cc2f2c53e4c699abeefed5869c3ca8da1ef6481 100644 (file)
--- a/include/linux/lis3lv02d.h
+++ b/include/linux/lis3lv02d.h
@@ -32,8 +32,17 @@ struct lis3lv02d_platform_data {
 #define LIS3_IRQ2_DATA_READY   (4 << 3)
 #define LIS3_IRQ2_CLICK                (7 << 3)
 #define LIS3_IRQ_OPEN_DRAIN    (1 << 6)
-#define LIS3_IRQ_ACTIVE_HIGH   (1 << 7)
+#define LIS3_IRQ_ACTIVE_LOW    (1 << 7)
        unsigned char irq_cfg;
+
+#define LIS3_WAKEUP_X_LO       (1 << 0)
+#define LIS3_WAKEUP_X_HI       (1 << 1)
+#define LIS3_WAKEUP_Y_LO       (1 << 2)
+#define LIS3_WAKEUP_Y_HI       (1 << 3)
+#define LIS3_WAKEUP_Z_LO       (1 << 4)
+#define LIS3_WAKEUP_Z_HI       (1 << 5)
+       unsigned char wakeup_flags;
+       unsigned char wakeup_thresh;
 };
 
 #endif /* __LIS3LV02D_H_ */