diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /drivers/i2c/busses/i2c-davinci.c | |
| parent | 373a6da165ac3012a74fd072da340eabca55d031 (diff) | |
| parent | ea67db4cdbbf7f4e74150e71da0984e25121f500 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/i2c/busses/i2c-davinci.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-davinci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index bd7aaff35240..67679882ebef 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c | |||
| @@ -404,7 +404,7 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id) | |||
| 404 | DAVINCI_I2C_STR_REG, | 404 | DAVINCI_I2C_STR_REG, |
| 405 | w); | 405 | w); |
| 406 | } else | 406 | } else |
| 407 | dev_err(dev->dev, "RDR IRQ while no" | 407 | dev_err(dev->dev, "RDR IRQ while no " |
| 408 | "data requested\n"); | 408 | "data requested\n"); |
| 409 | break; | 409 | break; |
| 410 | 410 | ||
| @@ -423,7 +423,7 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id) | |||
| 423 | DAVINCI_I2C_IMR_REG, | 423 | DAVINCI_I2C_IMR_REG, |
| 424 | w); | 424 | w); |
| 425 | } else | 425 | } else |
| 426 | dev_err(dev->dev, "TDR IRQ while no data to" | 426 | dev_err(dev->dev, "TDR IRQ while no data to " |
| 427 | "send\n"); | 427 | "send\n"); |
| 428 | break; | 428 | break; |
| 429 | 429 | ||