diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-13 16:25:59 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-13 16:25:59 +0200 |
| commit | 30beab1491f0b96b2f23d3fb68af01fd921a16d8 (patch) | |
| tree | c580bdc0846269fbb10feeda901ecec1a48ee2ef /drivers/i2c/busses/i2c-keywest.c | |
| parent | AUDIT: Really don't audit auditd. (diff) | |
| parent | Linux 2.6.13-rc3 (diff) | |
| download | linux-30beab1491f0b96b2f23d3fb68af01fd921a16d8.tar.xz linux-30beab1491f0b96b2f23d3fb68af01fd921a16d8.zip | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'drivers/i2c/busses/i2c-keywest.c')
| -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" }, |