projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'fcoe1' into fixes
[cascardo/linux.git]
/
drivers
/
media
/
platform
/
exynos4-is
/
fimc-is.h
diff --git
a/drivers/media/platform/exynos4-is/fimc-is.h
b/drivers/media/platform/exynos4-is/fimc-is.h
index
f5275a5
..
d7db133
100644
(file)
--- a/
drivers/media/platform/exynos4-is/fimc-is.h
+++ b/
drivers/media/platform/exynos4-is/fimc-is.h
@@
-73,7
+73,6
@@
enum {
ISS_CLK_LITE0,
ISS_CLK_LITE1,
ISS_CLK_MPLL,
- ISS_CLK_SYSREG,
ISS_CLK_ISP,
ISS_CLK_DRC,
ISS_CLK_FD,
@@
-265,7
+264,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;