From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/media/video/saa7134/saa7134-input.c | 12 ------------ 1 file changed, 12 deletions(-) diff -puN drivers/media/video/saa7134/saa7134-input.c~git-dvb-fixup drivers/media/video/saa7134/saa7134-input.c --- a/drivers/media/video/saa7134/saa7134-input.c~git-dvb-fixup +++ a/drivers/media/video/saa7134/saa7134-input.c @@ -194,7 +194,6 @@ int saa7134_input_init1(struct saa7134_d saa_setb(SAA7134_GPIO_GPMODE0, 0x4); saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4); break; -<<<<<<< HEAD/drivers/media/video/saa7134/saa7134-input.c case SAA7134_BOARD_AVERMEDIA_777: case SAA7134_BOARD_AVERMEDIA_A16AR: ir_codes = ir_codes_avermedia; @@ -205,17 +204,6 @@ int saa7134_input_init1(struct saa7134_d saa_setb(SAA7134_GPIO_GPMODE1, 0x1); saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1); break; -======= - case SAA7134_BOARD_AVERMEDIA_777: - case SAA7134_BOARD_AVERMEDIA_A16AR: - ir_codes = ir_codes_avermedia; - mask_keycode = 0x02F200; - mask_keydown = 0x000400; - polling = 50; // ms - /* Without this we won't receive key up events */ - saa_setb(SAA7134_GPIO_GPMODE1, 0x1); - saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1); ->>>>>>> /drivers/media/video/saa7134/saa7134-input.c case SAA7134_BOARD_KWORLD_TERMINATOR: ir_codes = ir_codes_pixelview; mask_keycode = 0x00001f; _