Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a93f420 authored by Ben Dooks's avatar Ben Dooks
Browse files

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
parents 1bda7128 5043e9e7

arch/arm/mach-omap2/clock24xx.h

+2 −2
Original line number Diff line number Diff line
@@ -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,

drivers/i2c/busses/i2c-omap.c

+328 −92

File changed.

Preview size limit exceeded, changes collapsed.