Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[mv-sheeva.git] / drivers / media / video / cx231xx / cx231xx.h

diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h
index a0f823ac6b8d4db3c3c30fe99f7acde86cdff356..64e2ddd3c4018358e073da2ce5e0af094dd337ff 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx.h
+++ b/drivers/media/video/cx231xx/cx231xx.h
@@ -282,7 +282,7 @@ struct cx231xx_board {
 
        struct cx231xx_input input[MAX_CX231XX_INPUT];
        struct cx231xx_input radio;
-       IR_KEYTAB_TYPE *ir_codes;
+       struct ir_scancode_table *ir_codes;
 };
 
 /* device states */