3 files changed, 6 insertions, 5 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c
index 5b68bad01..b6ee5b112 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c
@@ -198,7 +198,7 @@ static int pvr2_encoder_cmd(void *ctxt,
 			" - too many input arguments"
 			" (was given %u limit %u)",
 			arg_cnt_send,
-			(sizeof(wrData)/sizeof(wrData[0])) - 4);
+			(unsigned int)(sizeof(wrData)/sizeof(wrData[0])) - 4);
 		return -EINVAL;
 	}
 
@@ -209,7 +209,7 @@ static int pvr2_encoder_cmd(void *ctxt,
 			" - too many return arguments"
 			" (was given %u limit %u)",
 			arg_cnt_recv,
-			(sizeof(rdData)/sizeof(rdData[0])) - 4);
+			(unsigned int)(sizeof(rdData)/sizeof(rdData[0])) - 4);
 		return -EINVAL;
 	}
 
@@ -308,7 +308,7 @@ static int pvr2_encoder_vcmd(struct pvr2_hdw *hdw, int cmd,
 			"Failed to write cx23416 command"
 			" - too many arguments"
 			" (was given %u limit %u)",
-			args,sizeof(data)/sizeof(data[0]));
+			args,(unsigned int)(sizeof(data)/sizeof(data[0])));
 		return -EINVAL;
 	}
 
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 01d8d8f4a..e1ac2c386 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -22,6 +22,7 @@
 
 #include "compat.h"
 #include <linux/kernel.h>
+#include <linux/version.h>
 #include "pvrusb2-context.h"
 #include "pvrusb2-hdw.h"
 #include "pvrusb2.h"
diff --git a/linux/drivers/media/video/stradis.c b/linux/drivers/media/video/stradis.c
index 40ebe8adf..1e8bf1b99 100644
--- a/linux/drivers/media/video/stradis.c
+++ b/linux/drivers/media/video/stradis.c
@@ -2191,7 +2191,7 @@ static struct pci_driver stradis_driver = {
 	.remove = __devexit_p(stradis_remove)
 };
 
-int __init stradis_init(void)
+static int __init stradis_init(void)
 {
 	int retval;
 
@@ -2204,7 +2204,7 @@ int __init stradis_init(void)
 	return retval;
 }
 
-void __exit stradis_exit(void)
+static void __exit stradis_exit(void)
 {
 	pci_unregister_driver(&stradis_driver);
 	printk(KERN_INFO "stradis: module cleanup complete\n");