diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 00:58:04 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 00:58:04 -0500 |
| commit | e0d21d9cca25f424f3129649be48a63c128ed42d (patch) | |
| tree | 0a7d407639876e02deef1721817615eaa8c673a3 /drivers/i2c | |
| parent | beffbdc2211826b174c68307b1b48c93c05d7ded (diff) | |
| parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) | |
| download | linux-e0d21d9cca25f424f3129649be48a63c128ed42d.tar.gz linux-e0d21d9cca25f424f3129649be48a63c128ed42d.tar.xz | |
Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-keywest.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c index 363e545fc01f..94ae808314f7 100644 --- a/drivers/i2c/busses/i2c-keywest.c +++ b/drivers/i2c/busses/i2c-keywest.c @@ -698,7 +698,7 @@ dispose_iface(struct device *dev) } static int -create_iface_macio(struct macio_dev* dev, const struct of_match *match) +create_iface_macio(struct macio_dev* dev, const struct of_device_id *match) { return create_iface(dev->ofdev.node, &dev->ofdev.dev); } @@ -710,7 +710,7 @@ dispose_iface_macio(struct macio_dev* dev) } static int -create_iface_of_platform(struct of_device* dev, const struct of_match *match) +create_iface_of_platform(struct of_device* dev, const struct of_device_id *match) { return create_iface(dev->node, &dev->dev); } @@ -721,10 +721,9 @@ dispose_iface_of_platform(struct of_device* dev) return dispose_iface(&dev->dev); } -static struct of_match i2c_keywest_match[] = +static struct of_device_id i2c_keywest_match[] = { { - .name = OF_ANY_MATCH, .type = "i2c", .compatible = "keywest" }, |