From d5e5265315770bda46c50ecaa64e2b9790f2064c Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Tue, 8 Nov 2005 21:37:32 -0800
Subject: [PATCH] v4l: 784: several improvement on i2c ir handling for em2820

- Several Improvement on I2C IR handling for em2820:
        - moved Pinnacle IR table (ir_codes_em2820) to em2820-input.c
        - IR struct renamed and moved to a header file.
        - New file to handle em2820-specific IR.
        - Some cleanups.
        - attach now detects I2C IR and calls em2820-specific IR code
        - IR compat code moved to compat.h
        - New header with struct IR_i2c there, to allow it to be
          used by board-specific input handlers.

- Some improvements at em28xx board detection:
        - Board detection message improved to show interface and class.
        - Now it doesn't touch audio interfaces.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---
 drivers/media/video/em28xx/em28xx-cards.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'drivers/media/video/em28xx/em28xx-cards.c')

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 91c70ebd0ea4..919520f89975 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -143,7 +143,7 @@ struct em2820_board em2820_boards[] = {
 		.tuner_type	= TUNER_PHILIPS_PAL,
 		.tda9887_conf	= TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE,
 		.has_tuner	= 1,
-		.decoder      = EM2820_SAA7114,
+		.decoder        = EM2820_SAA7114,
 		.input          = {{
 			.type     = EM2820_VMUX_TELEVISION,
 			.vmux     = 2,
@@ -250,6 +250,7 @@ void em2820_card_setup(struct em2820 *dev)
 		struct tveeprom tv;
 #ifdef CONFIG_MODULES
 		request_module("tveeprom");
+		request_module("ir-kbd-i2c");
 #endif
 		/* Call first TVeeprom */
 
-- 
cgit v1.2.2