diff options
| author | Mike Isely <isely@pobox.com> | 2006-04-25 19:26:46 -0500 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-04-25 19:26:46 -0500 |
| commit | e362706b3e90987c5ca839def8372bff58fea7c0 (patch) | |
| tree | 2c94262c383b9f881b278b9bfe0499231a7458ef /linux/drivers/media/video/pwc/pwc-kiara.h | |
| parent | 60f073ffa46dc14bcbc82b9c14ff5fb6cc2a5102 (diff) | |
| parent | 682261e2c90d58868dd27ef1c524e327074a637d (diff) | |
| download | mediapointer-dvb-s2-e362706b3e90987c5ca839def8372bff58fea7c0.tar.gz mediapointer-dvb-s2-e362706b3e90987c5ca839def8372bff58fea7c0.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc-kiara.h')
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc-kiara.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-kiara.h b/linux/drivers/media/video/pwc/pwc-kiara.h index 12929abbb..0bdb22547 100644 --- a/linux/drivers/media/video/pwc/pwc-kiara.h +++ b/linux/drivers/media/video/pwc/pwc-kiara.h @@ -1,5 +1,5 @@ /* Linux driver for Philips webcam - (C) 2004 Luc Saillard (luc@saillard.org) + (C) 2004-2006 Luc Saillard (luc@saillard.org) NOTE: this version of pwc is an unofficial (modified) release of pwc & pcwx driver and thus may have bugs that are not present in the original version. @@ -27,7 +27,7 @@ #ifndef PWC_KIARA_H #define PWC_KIARA_H -#include "pwc-ioctl.h" +#include <media/pwc-ioctl.h> struct Kiara_table_entry { @@ -37,8 +37,8 @@ struct Kiara_table_entry unsigned char mode[12]; /* precomputed mode settings for cam */ }; -const extern struct Kiara_table_entry Kiara_table[PSZ_MAX][6][4]; -const extern unsigned int KiaraRomTable[8][2][16][8]; +extern const struct Kiara_table_entry Kiara_table[PSZ_MAX][6][4]; +extern const unsigned int KiaraRomTable[8][2][16][8]; #endif |