diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-20 02:24:42 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-20 02:24:42 +0300 |
| commit | 3b762d321a5e73d3a892a13f0c84dc1d3d50e928 (patch) | |
| tree | 84239bfcf3682352d7cebc2a118184092419acf7 /drivers/i2c/busses/i2c-ixp4xx.c | |
| parent | 29ac878a71d1900cc2e283819b1daa388961ab6e (diff) | |
| parent | 20913a9f6e3ae9a7facf96c7b1299e3875a895a0 (diff) | |
| download | linux-3b762d321a5e73d3a892a13f0c84dc1d3d50e928.tar.xz | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual fixups to ARM ixp4xxx by hand.
Diffstat (limited to 'drivers/i2c/busses/i2c-ixp4xx.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-ixp4xx.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c index f87220be3c87..e422d8b2d4d6 100644 --- a/drivers/i2c/busses/i2c-ixp4xx.c +++ b/drivers/i2c/busses/i2c-ixp4xx.c @@ -35,8 +35,6 @@ #include <asm/hardware.h> /* Pick up IXP4xx-specific bits */ -static struct platform_driver ixp4xx_i2c_driver; - static inline int ixp4xx_scl_pin(void *data) { return ((struct ixp4xx_i2c_pins*)data)->scl_pin; @@ -128,7 +126,7 @@ static int ixp4xx_i2c_probe(struct platform_device *plat_dev) drv_data->algo_data.timeout = 100; drv_data->adapter.id = I2C_HW_B_IXP4XX; - strlcpy(drv_data->adapter.name, ixp4xx_i2c_driver.driver.name, + strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name, I2C_NAME_SIZE); drv_data->adapter.algo_data = &drv_data->algo_data; @@ -140,8 +138,7 @@ static int ixp4xx_i2c_probe(struct platform_device *plat_dev) gpio_line_set(gpio->sda_pin, 0); if ((err = i2c_bit_add_bus(&drv_data->adapter) != 0)) { - printk(KERN_ERR "ERROR: Could not install %s\n", - plat_dev->dev.bus_id); + printk(KERN_ERR "ERROR: Could not install %s\n", plat_dev->dev.bus_id); kfree(drv_data); return err; |