diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-25 10:24:22 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-25 10:25:09 (GMT) |
| commit | 188af63c0af2d7ef395bc94e3efa173f34dae03d (patch) | |
| tree | c2648c26ac37b836140ad499e0f5c0eec5586f5f /drivers/media/platform/exynos4-is/fimc-is.h | |
| parent | 05959be7b646e8755a9339ad13e3b87849249f90 (diff) | |
| parent | bb69ee27b96110c509d5b92c9ee541d81a821706 (diff) | |
| download | linux-188af63c0af2d7ef395bc94e3efa173f34dae03d.tar.xz | |
Merge branch 'v4l_for_linus' into patchwork
* v4l_for_linus:
[media] Fix build when drivers are builtin and frontend modules
[media] s5p makefiles: don't override other selections on obj-[ym]
[media] exynos4-is: Fix FIMC-IS clocks initialization
[media] rtl28xxu: fix buffer overflow when probing Rafael Micro r820t tuner
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/exynos4-is/fimc-is.h')
| -rw-r--r-- | drivers/media/platform/exynos4-is/fimc-is.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-is.h b/drivers/media/platform/exynos4-is/fimc-is.h index 4b0eccb..08fa518 100644 --- a/drivers/media/platform/exynos4-is/fimc-is.h +++ b/drivers/media/platform/exynos4-is/fimc-is.h @@ -263,7 +263,6 @@ struct fimc_is { spinlock_t slock; struct clk *clocks[ISS_CLKS_MAX]; - bool clk_init; void __iomem *regs; void __iomem *pmu_regs; int irq; |