Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / dvb / siano / smsir.h

diff --git a/drivers/media/dvb/siano/smsir.h b/drivers/media/dvb/siano/smsir.h
index 926e247523bd149d3185c0a4b4d965dab41fd354..ae92b3a8587e5d4a32e7d5f2a8b35b047f71f2d8 100644 (file)
--- a/drivers/media/dvb/siano/smsir.h
+++ b/drivers/media/dvb/siano/smsir.h
@@ -28,20 +28,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define __SMS_IR_H__
 
 #include <linux/input.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 
 #define IR_DEFAULT_TIMEOUT             100
 
 struct smscore_device_t;
 
 struct ir_t {
-       struct input_dev *input_dev;
+       struct rc_dev *dev;
        char name[40];
        char phys[32];
 
        char *rc_codes;
        u64 protocol;
-       struct ir_dev_props props;
 
        u32 timeout;
        u32 controller;