diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 19:38:04 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 19:38:04 +0200 |
| commit | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (patch) | |
| tree | 8492ea548fea2d8243e4af4b877906afc4e32783 /drivers/i2c/busses/i2c-s3c2410.c | |
| parent | b4093d6235b7e4249616651ee328600ced48a18a (diff) | |
| parent | 658874f05d040ca96eb5ba9b1c30ce0ff287d762 (diff) | |
| download | kernel_samsung_smdk4412-2e6713c7662cc5ebc7346b033c404cb2f708fd51.zip kernel_samsung_smdk4412-2e6713c7662cc5ebc7346b033c404cb2f708fd51.tar.gz kernel_samsung_smdk4412-2e6713c7662cc5ebc7346b033c404cb2f708fd51.tar.bz2 | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/i2c/busses/i2c-s3c2410.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 3be0d6a..96aafb9 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -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; } |