summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pvrusb2/pvrusb2-std.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-02-23 16:54:56 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-23 16:54:56 -0200
commit2d65658078459d35572e637c8cb1b6fc3826f12a (patch)
treee18d3f1e0e68c693a727e429934e42af169a2853 /linux/drivers/media/video/pvrusb2/pvrusb2-std.c
parentb64c80be829fbeb8b936ca6d61a59013d8ad2bba (diff)
parentcc88074b4da7cb25b8c2bc93f41434cfc1763924 (diff)
downloadmediapointer-dvb-s2-2d65658078459d35572e637c8cb1b6fc3826f12a.tar.gz
mediapointer-dvb-s2-2d65658078459d35572e637c8cb1b6fc3826f12a.tar.bz2
merge: http://linuxtv.org/hg/~mrechberger/v4l-dvb-cx88
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-std.c')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-std.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-std.c b/linux/drivers/media/video/pvrusb2/pvrusb2-std.c
index 4de535498..926b6bfca 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-std.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-std.c
@@ -23,6 +23,7 @@
#include "pvrusb2-debug.h"
#include <asm/string.h>
#include <linux/slab.h>
+#include "compat.h"
struct std_name {
const char *name;
@@ -78,14 +79,14 @@ struct std_name {
#define CSTD_ALL (CSTD_PAL|CSTD_NTSC|CSTD_SECAM)
/* Mapping of standard bits to color system */
-const static struct std_name std_groups[] = {
+static const struct std_name std_groups[] = {
{"PAL",CSTD_PAL},
{"NTSC",CSTD_NTSC},
{"SECAM",CSTD_SECAM},
};
/* Mapping of standard bits to modulation system */
-const static struct std_name std_items[] = {
+static const struct std_name std_items[] = {
{"B",TSTD_B},
{"B1",TSTD_B1},
{"D",TSTD_D},