Merge commit 'v2.6.26-rc9' into x86/cpu

3 files changed, 8 insertions, 4 deletions

diff --git a/include/media/cx25840.h b/include/media/cx25840.h
index cd599ad29fb2..db431d513f2f 100644
--- a/include/media/cx25840.h
+++ b/include/media/cx25840.h
@@ -32,12 +32,16 @@ enum cx25840_video_input {
         CX25840_COMPOSITE7,
         CX25840_COMPOSITE8,
 
-        /* S-Video inputs consist of one luma input (In1-In4) ORed with one
+        /* S-Video inputs consist of one luma input (In1-In8) ORed with one
            chroma input (In5-In8) */
         CX25840_SVIDEO_LUMA1 = 0x10,
         CX25840_SVIDEO_LUMA2 = 0x20,
         CX25840_SVIDEO_LUMA3 = 0x30,
         CX25840_SVIDEO_LUMA4 = 0x40,
+        CX25840_SVIDEO_LUMA5 = 0x50,
+        CX25840_SVIDEO_LUMA6 = 0x60,
+        CX25840_SVIDEO_LUMA7 = 0x70,
+        CX25840_SVIDEO_LUMA8 = 0x80,
         CX25840_SVIDEO_CHROMA4 = 0x400,
         CX25840_SVIDEO_CHROMA5 = 0x500,
         CX25840_SVIDEO_CHROMA6 = 0x600,
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index bfee8be5d63f..b8e8aa91905a 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -146,6 +146,7 @@ extern IR_KEYTAB_TYPE ir_codes_behold_columbus[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_pinnacle_pctv_hd[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_genius_tvgo_a11mce[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_powercolor_real_angel[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_avermedia_a16d[IR_KEYTAB_SIZE];
 
 #endif
 
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index a807d2f86ee8..859f7a6f6f67 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -40,10 +40,9 @@
 #define VFL_TYPE_VTX            3
 
 /*  Video standard functions  */
-extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs);
-extern char *v4l2_norm_to_name(v4l2_std_id id);
+extern const char *v4l2_norm_to_name(v4l2_std_id id);
 extern int v4l2_video_std_construct(struct v4l2_standard *vs,
-                                    int id, char *name);
+                                    int id, const char *name);
 /* Prints the ioctl in a human-readable format */
 extern void v4l_printk_ioctl(unsigned int cmd);