Merge branch 'for-linus' of git://ceph.newdream.net/git/ceph-client

[pandora-kernel.git] / drivers / media / rc / rc-core-priv.h

diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
index 873b387..04c2c72 100644 (file)
--- a/drivers/media/rc/rc-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -84,6 +84,17 @@ struct ir_raw_event_ctrl {
                unsigned count;
                unsigned wanted_bits;
        } rc5_sz;
+       struct mce_kbd_dec {
+               struct input_dev *idev;
+               struct timer_list rx_timeout;
+               char name[64];
+               char phys[64];
+               int state;
+               u8 header;
+               u32 body;
+               unsigned count;
+               unsigned wanted_bits;
+       } mce_kbd;
        struct lirc_codec {
                struct rc_dev *dev;
                struct lirc_driver *drv;
@@ -182,6 +193,13 @@ void ir_raw_init(void);
 #define load_sony_decode()     0
 #endif
 
+/* from ir-mce_kbd-decoder.c */
+#ifdef CONFIG_IR_MCE_KBD_DECODER_MODULE
+#define load_mce_kbd_decode()  request_module("ir-mce_kbd-decoder")
+#else
+#define load_mce_kbd_decode()  0
+#endif
+
 /* from ir-lirc-codec.c */
 #ifdef CONFIG_IR_LIRC_CODEC_MODULE
 #define load_lirc_codec()      request_module("ir-lirc-codec")