Merge branch 'for-2638/i2c/nomadik' into for-linus/i2c-2638
This commit is contained in:
Коммит
adeaf46d31
|
@ -872,6 +872,8 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev)
|
|||
adap->owner = THIS_MODULE;
|
||||
adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
|
||||
adap->algo = &nmk_i2c_algo;
|
||||
snprintf(adap->name, sizeof(adap->name),
|
||||
"Nomadik I2C%d at %lx", pdev->id, (unsigned long)res->start);
|
||||
|
||||
/* fetch the controller id */
|
||||
adap->nr = pdev->id;
|
||||
|
@ -891,8 +893,8 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev)
|
|||
goto err_init_hw;
|
||||
}
|
||||
|
||||
dev_dbg(&pdev->dev, "initialize I2C%d bus on virtual "
|
||||
"base %p\n", pdev->id, dev->virtbase);
|
||||
dev_info(&pdev->dev, "initialize %s on virtual "
|
||||
"base %p\n", adap->name, dev->virtbase);
|
||||
|
||||
ret = i2c_add_numbered_adapter(adap);
|
||||
if (ret) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче