lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'origin/master' into next

Browse Source 
Manual merge of:
	arch/powerpc/kernel/asm-offsets.c
This commit is contained in:
Benjamin Herrenschmidt
2009-06-12 16:53:38 +10:00
parent 37f9ef553b 8ebf975608
commit bc47ab0241
1642 changed files with 101409 additions and 33981 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/i2c/busses/i2c-sh7760.c
View File

@@ -396,7 +396,7 @@ static int __devinit calc_CCR(unsigned long scl_hz)
signed char cdf, cdfm;
int scgd, scgdm, scgds;
mclk = clk_get(NULL, "module_clk");
mclk = clk_get(NULL, "peripheral_clk");
if (IS_ERR(mclk)) {
return PTR_ERR(mclk);
} else {