Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel

[linux-2.6-omap-h63xx.git] / drivers / media / video / bttvp.h

diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h
index 7a312f79340aa3786ef721e4c1bae0f7d00883e9..e0e7c7a84bc53015d1c4064d48b323aea570a691 100644 (file)
--- a/drivers/media/video/bttvp.h
+++ b/drivers/media/video/bttvp.h
@@ -240,7 +240,7 @@ struct bttv_pll_info {
 
 /* for gpio-connected remote control */
 struct bttv_input {
-       struct input_dev      dev;
+       struct input_dev      *dev;
        struct ir_input_state ir;
        char                  name[32];
        char                  phys[32];