summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pwc/pwc-timon.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-05-06 10:03:10 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-05-06 10:03:10 -0300
commit76775b7f2ced0c0301ac3ae201aafc3d9b88e091 (patch)
treef0ad9167da8049f5b468fe5a58a1f438450665d6 /linux/drivers/media/video/pwc/pwc-timon.h
parent8ab655cc3c286a78e3af8ac2a88a839ea073306a (diff)
parent46cf6abc45f699c5843872c7ef8e782e4d0e1a27 (diff)
downloadmediapointer-dvb-s2-76775b7f2ced0c0301ac3ae201aafc3d9b88e091.tar.gz
mediapointer-dvb-s2-76775b7f2ced0c0301ac3ae201aafc3d9b88e091.tar.bz2
merge: http://linuxtv.org/hg/~aapot/m920x
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc-timon.h')
-rw-r--r--linux/drivers/media/video/pwc/pwc-timon.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-timon.h b/linux/drivers/media/video/pwc/pwc-timon.h
index eef9e2cd4..a6e22224c 100644
--- a/linux/drivers/media/video/pwc/pwc-timon.h
+++ b/linux/drivers/media/video/pwc/pwc-timon.h
@@ -44,6 +44,8 @@
#include <media/pwc-ioctl.h>
+#define PWC_FPS_MAX_TIMON 6
+
struct Timon_table_entry
{
char alternate; /* USB alternate interface */
@@ -52,9 +54,9 @@ struct Timon_table_entry
unsigned char mode[13]; /* precomputed mode settings for cam */
};
-extern const struct Timon_table_entry Timon_table[PSZ_MAX][6][4];
+extern const struct Timon_table_entry Timon_table[PSZ_MAX][PWC_FPS_MAX_TIMON][4];
extern const unsigned int TimonRomTable [16][2][16][8];
-
+extern const unsigned int Timon_fps_vector[PWC_FPS_MAX_TIMON];
#endif