diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 12:55:28 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 12:55:28 (GMT) |
commit | 0c929238ca4baefe47f4034732db4c154f2329c6 (patch) | |
tree | 2636079800fa045501982a70e1be0425c1b968c2 /drivers/media/video/zoran | |
parent | 6d7120a713300283a8b73e7d86cd1bab8b9d1971 (diff) | |
parent | 78da107a7ed14fbc6ef77ff4c41d92b11edc9036 (diff) | |
download | linux-fsl-qoriq-0c929238ca4baefe47f4034732db4c154f2329c6.tar.xz |
Merge branch 'sh/platform-updates' into sh-latest
Diffstat (limited to 'drivers/media/video/zoran')
-rw-r--r-- | drivers/media/video/zoran/zoran_device.c | 2 | ||||
-rw-r--r-- | drivers/media/video/zoran/zr36060.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/zoran/zoran_device.c b/drivers/media/video/zoran/zoran_device.c index e8a2784..e86173b 100644 --- a/drivers/media/video/zoran/zoran_device.c +++ b/drivers/media/video/zoran/zoran_device.c @@ -57,7 +57,7 @@ ZR36057_ISR_GIRQ1 | \ ZR36057_ISR_JPEGRepIRQ ) -static int lml33dpath; /* default = 0 +static bool lml33dpath; /* default = 0 * 1 will use digital path in capture * mode instead of analog. It can be * used for picture adjustments using diff --git a/drivers/media/video/zoran/zr36060.c b/drivers/media/video/zoran/zr36060.c index 5e4f57c..f08546f 100644 --- a/drivers/media/video/zoran/zr36060.c +++ b/drivers/media/video/zoran/zr36060.c @@ -50,7 +50,7 @@ /* amount of chips attached via this driver */ static int zr36060_codecs; -static int low_bitrate; +static bool low_bitrate; module_param(low_bitrate, bool, 0); MODULE_PARM_DESC(low_bitrate, "Buz compatibility option, halves bitrate"); |