diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-15 00:20:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-15 00:20:04 +0200 |
| commit | 77b2555b52a894a2e39a42e43d993df875c46a6a (patch) | |
| tree | b3ef50ff649d689bd425b68f3173dfab3e1f10a2 /drivers | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | [I2C] Add a functionality method, and remove algorithm ids (diff) | |
| download | linux-77b2555b52a894a2e39a42e43d993df875c46a6a.tar.xz linux-77b2555b52a894a2e39a42e43d993df875c46a6a.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-i2c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index fdf53ce04248..44b595d90a4a 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -914,19 +914,23 @@ static int i2c_pxa_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num return ret; } +static u32 i2c_pxa_functionality(struct i2c_adapter *adap) +{ + return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; +} + static struct i2c_algorithm i2c_pxa_algorithm = { - .name = "PXA-I2C-Algorithm", - .id = I2C_ALGO_PXA, .master_xfer = i2c_pxa_xfer, + .functionality = i2c_pxa_functionality, }; static struct pxa_i2c i2c_pxa = { .lock = SPIN_LOCK_UNLOCKED, .wait = __WAIT_QUEUE_HEAD_INITIALIZER(i2c_pxa.wait), .adap = { - .name = "pxa2xx-i2c", - .id = I2C_ALGO_PXA, + .owner = THIS_MODULE, .algo = &i2c_pxa_algorithm, + .name = "pxa2xx-i2c", .retries = 5, }, }; |