diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-17 18:14:02 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-17 18:14:02 -0500 |
| commit | fea83f6a9b0a90fefca16ac3534e308f6c34144b (patch) | |
| tree | 3da88c54c83a1cb8ef53db62c9c2c7fc2c2ecbe5 /drivers/i2c/busses | |
| parent | df127ee375af4cb40b979605e0c336fc79bd38e7 (diff) | |
| parent | 2d200665c37f544f648d77a05a06ab63328f0d3a (diff) | |
Merge branch 'devel-board' into omap-for-linus
Diffstat (limited to 'drivers/i2c/busses')
| -rw-r--r-- | drivers/i2c/busses/i2c-intel-mid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-intel-mid.c b/drivers/i2c/busses/i2c-intel-mid.c index 80f70d3a744d..c71492782bbd 100644 --- a/drivers/i2c/busses/i2c-intel-mid.c +++ b/drivers/i2c/busses/i2c-intel-mid.c | |||
| @@ -999,7 +999,7 @@ static int __devinit intel_mid_i2c_probe(struct pci_dev *dev, | |||
| 999 | 999 | ||
| 1000 | /* Initialize struct members */ | 1000 | /* Initialize struct members */ |
| 1001 | snprintf(mrst->adap.name, sizeof(mrst->adap.name), | 1001 | snprintf(mrst->adap.name, sizeof(mrst->adap.name), |
| 1002 | "MRST/Medfield I2C at %lx", start); | 1002 | "Intel MID I2C at %lx", start); |
| 1003 | mrst->adap.owner = THIS_MODULE; | 1003 | mrst->adap.owner = THIS_MODULE; |
| 1004 | mrst->adap.algo = &intel_mid_i2c_algorithm; | 1004 | mrst->adap.algo = &intel_mid_i2c_algorithm; |
| 1005 | mrst->adap.dev.parent = &dev->dev; | 1005 | mrst->adap.dev.parent = &dev->dev; |