diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 11:59:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 11:59:27 -0800 |
| commit | fa7b906e7fef53b6c9eb3ecb8164b0a69e9e1a68 (patch) | |
| tree | 8fa745403e1506c211d00ce787d71ee647d65ea2 /drivers/i2c/busses/i2c-pxa.c | |
| parent | 08249903ea233a79b4167395f2fb79ccd1fb5f94 (diff) | |
| parent | 66c7acf61dc6b27954bb9ceb8617d447ac03734a (diff) | |
| download | blackbird-op-linux-fa7b906e7fef53b6c9eb3ecb8164b0a69e9e1a68.tar.gz blackbird-op-linux-fa7b906e7fef53b6c9eb3ecb8164b0a69e9e1a68.zip | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c: Use snprintf to set adapter names
Input: apanel - convert to new i2c binding
i2c: Drop I2C_CLASS_CAM_DIGITAL
i2c: Drop I2C_CLASS_CAM_ANALOG and I2C_CLASS_SOUND
i2c: Drop I2C_CLASS_ALL
i2c: Get rid of remaining bus_id access
i2c: Replace bus_id with dev_name(), dev_set_name()
Diffstat (limited to 'drivers/i2c/busses/i2c-pxa.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 587f5b2380d4..6af68146c342 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1076,10 +1076,10 @@ static int i2c_pxa_probe(struct platform_device *dev) #ifdef CONFIG_I2C_PXA_SLAVE printk(KERN_INFO "I2C: %s: PXA I2C adapter, slave address %d\n", - i2c->adap.dev.bus_id, i2c->slave_addr); + dev_name(&i2c->adap.dev), i2c->slave_addr); #else printk(KERN_INFO "I2C: %s: PXA I2C adapter\n", - i2c->adap.dev.bus_id); + dev_name(&i2c->adap.dev)); #endif return 0; |
