Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / media / dvb / mantis / mantis_common.h

diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h
index d0b645a483c9ccb52a2bdd835a8be0f5892ea27e..bd400d21b81fb848ac1c0c1225a62aed9a7d0f8a 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_common.h
+++ b/drivers/media/dvb/mantis/mantis_common.h
@@ -171,7 +171,9 @@ struct mantis_pci {
        struct work_struct      uart_work;
        spinlock_t              uart_lock;
 
-       struct input_dev        *rc;
+       struct rc_dev           *rc;
+       char                    input_name[80];
+       char                    input_phys[80];
 };
 
 #define MANTIS_HIF_STATUS      (mantis->gpio_status)