summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pwc/pwc-kiara.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-05-22 10:30:04 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-05-22 10:30:04 -0300
commit4a78e983d25641804f5c0c83b6c10e51063b7872 (patch)
treece0631476907751234d1d60ee9d1f72e18b30de2 /linux/drivers/media/video/pwc/pwc-kiara.h
parent2a03de082a1ec685712a48cedb06a73d5d607088 (diff)
parent126b42f75f3d60cf024d206f8d7fb8680903cf8a (diff)
downloadmediapointer-dvb-s2-4a78e983d25641804f5c0c83b6c10e51063b7872.tar.gz
mediapointer-dvb-s2-4a78e983d25641804f5c0c83b6c10e51063b7872.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-kiara.h')
-rw-r--r--linux/drivers/media/video/pwc/pwc-kiara.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-kiara.h b/linux/drivers/media/video/pwc/pwc-kiara.h
index 0bdb22547..047dad8c1 100644
--- a/linux/drivers/media/video/pwc/pwc-kiara.h
+++ b/linux/drivers/media/video/pwc/pwc-kiara.h
@@ -29,6 +29,8 @@
#include <media/pwc-ioctl.h>
+#define PWC_FPS_MAX_KIARA 6
+
struct Kiara_table_entry
{
char alternate; /* USB alternate interface */
@@ -37,8 +39,9 @@ struct Kiara_table_entry
unsigned char mode[12]; /* precomputed mode settings for cam */
};
-extern const struct Kiara_table_entry Kiara_table[PSZ_MAX][6][4];
+extern const struct Kiara_table_entry Kiara_table[PSZ_MAX][PWC_FPS_MAX_KIARA][4];
extern const unsigned int KiaraRomTable[8][2][16][8];
+extern const unsigned int Kiara_fps_vector[PWC_FPS_MAX_KIARA];
#endif