git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
clock24xx.h
diff --git
a/arch/arm/mach-omap2/clock24xx.h
b/arch/arm/mach-omap2/clock24xx.h
index
458f00c
..
d19cf7a
100644
(file)
--- a/
arch/arm/mach-omap2/clock24xx.h
+++ b/
arch/arm/mach-omap2/clock24xx.h
@@
-2337,7
+2337,7
@@
static struct clk i2c2_fck = {
static struct clk i2chs2_fck = {
.name = "i2c_fck",
static struct clk i2chs2_fck = {
.name = "i2c_fck",
- .ops = &clkops_omap2
_dflt
_wait,
+ .ops = &clkops_omap2
430_i2chs
_wait,
.id = 2,
.parent = &func_96m_ck,
.clkdm_name = "core_l4_clkdm",
.id = 2,
.parent = &func_96m_ck,
.clkdm_name = "core_l4_clkdm",
@@
-2370,7
+2370,7
@@
static struct clk i2c1_fck = {
static struct clk i2chs1_fck = {
.name = "i2c_fck",
static struct clk i2chs1_fck = {
.name = "i2c_fck",
- .ops = &clkops_omap2
_dflt
_wait,
+ .ops = &clkops_omap2
430_i2chs
_wait,
.id = 1,
.parent = &func_96m_ck,
.clkdm_name = "core_l4_clkdm",
.id = 1,
.parent = &func_96m_ck,
.clkdm_name = "core_l4_clkdm",