[PATCH] v4l: 817: saa713x keymaps and key builders were moved from ir kbd i2c c

- SAA713x keymaps and key builders were moved from ir-kbd-i2c.c

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
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>

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 2577d03485b8..7575043f0874 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -335,6 +335,20 @@ static int attach_inform(struct i2c_client *client)
         d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
                  client->driver->name, client->addr, client->name);
 
+        /* Am I an i2c remote control? */
+
+        switch (client->addr) {
+                case 0x7a:
+                case 0x47:
+                {
+                        struct IR_i2c *ir = i2c_get_clientdata(client);
+                        d1printk("%s i2c IR detected (%s).\n",
+                                 client->driver->name,ir->phys);
+                        saa7134_set_i2c_ir(dev,ir);
+                        break;
+                }
+        }
+
         if (!client->driver->command)
                 return 0;