diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /drivers/i2c/busses/i2c-s3c2410.c | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/i2c/busses/i2c-s3c2410.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index e68a96f589fd..e4540fcf6476 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
| @@ -830,7 +830,8 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) | |||
| 830 | 830 | ||
| 831 | i2c->irq = res; | 831 | i2c->irq = res; |
| 832 | 832 | ||
| 833 | dev_dbg(&pdev->dev, "irq resource %p (%ld)\n", res, res->start); | 833 | dev_dbg(&pdev->dev, "irq resource %p (%lu)\n", res, |
| 834 | (unsigned long)res->start); | ||
| 834 | 835 | ||
| 835 | ret = i2c_add_adapter(&i2c->adap); | 836 | ret = i2c_add_adapter(&i2c->adap); |
| 836 | if (ret < 0) { | 837 | if (ret < 0) { |