Merge branch 'i2c-for-ben' of git://git.kernel.org/pub/scm/linux/kern…

…el/git/tmlind/linux-omap-2.6 into i2c-next
git-mirror · Dec 16, 2008 · 5a93f42 · 5a93f42
2 parents 1bda712 + 5043e9e
commit 5a93f42
Show file tree

Hide file tree

Showing 2 changed files with 330 additions and 94 deletions.
diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h
@@ -2321,7 +2321,7 @@ static struct clk i2c2_fck = {
 };
 
 static struct clk i2chs2_fck = {
-	.name		= "i2chs_fck",
+	.name		= "i2c_fck",
 	.id		= 2,
 	.parent		= &func_96m_ck,
 	.flags		= CLOCK_IN_OMAP243X,
@@ -2354,7 +2354,7 @@ static struct clk i2c1_fck = {
 };
 
 static struct clk i2chs1_fck = {
-	.name		= "i2chs_fck",
+	.name		= "i2c_fck",
 	.id		= 1,
 	.parent		= &func_96m_ck,
 	.flags		= CLOCK_IN_OMAP243X,