Merge branch 'master' into for-linus
This commit is contained in:
@@ -763,11 +763,6 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
|
||||
dev_info(i2c->dev, "bus frequency set to %d KHz\n", freq);
|
||||
dev_dbg(i2c->dev, "S3C2410_IICCON=0x%02lx\n", iicon);
|
||||
|
||||
/* check for s3c2440 i2c controller */
|
||||
|
||||
if (s3c24xx_i2c_is2440(i2c))
|
||||
writel(0x0, i2c->regs + S3C2440_IICLC);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user