summaryrefslogtreecommitdiff
path: root/drivers/i2c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-12-17 15:14:02 -0800
committerTony Lindgren <tony@atomide.com>2010-12-17 15:14:02 -0800
commitfea83f6a9b0a90fefca16ac3534e308f6c34144b (patch)
tree3da88c54c83a1cb8ef53db62c9c2c7fc2c2ecbe5 /drivers/i2c
parentdf127ee375af4cb40b979605e0c336fc79bd38e7 (diff)
parent2d200665c37f544f648d77a05a06ab63328f0d3a (diff)
Merge branch 'devel-board' into omap-for-linus
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-intel-mid.c2
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,
/* Initialize struct members */
snprintf(mrst->adap.name, sizeof(mrst->adap.name),
- "MRST/Medfield I2C at %lx", start);
+ "Intel MID I2C at %lx", start);
mrst->adap.owner = THIS_MODULE;
mrst->adap.algo = &intel_mid_i2c_algorithm;
mrst->adap.dev.parent = &dev->dev;