Merge branch 'i2c-for-ben' of...

Merge branch 'i2c-for-ben' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into i2c-next

Merge branch 'i2c-for-ben' of...
Merge branch 'i2c-for-ben' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into i2c-next
5a93f420 · Ben Dooks · 1bda7128 · 5043e9e7 · 5a93f420 · 5a93f420
Commit 5a93f420 authored Dec 16, 2008 by Ben Dooks
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 330 additions and 94 deletions

arch/arm/mach-omap2/clock24xx.h arch/arm/mach-omap2/clock24xx.h +2 -2

drivers/i2c/busses/i2c-omap.c drivers/i2c/busses/i2c-omap.c +328 -92

No files found.
--- 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,

--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c