diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-24 12:31:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-24 12:31:18 +1100 |
| commit | add902e5b0ec4c0f19c8fb255ad800d40e6cc01a (patch) | |
| tree | 952e9138673a59acca5b1808765e58540767e9b0 /drivers/sh/superhyway/superhyway.c | |
| parent | 27e1a1abb39177a99d2f55ab70255fcab4132f50 (diff) | |
| parent | 7bcd547ab98aff3ebf955cc59d976bc873fd3822 (diff) | |
Merge branch 'quilt/driver-core'
Diffstat (limited to 'drivers/sh/superhyway/superhyway.c')
| -rw-r--r-- | drivers/sh/superhyway/superhyway.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sh/superhyway/superhyway.c b/drivers/sh/superhyway/superhyway.c index 4d0282b821b5..2d9e7f3d5611 100644 --- a/drivers/sh/superhyway/superhyway.c +++ b/drivers/sh/superhyway/superhyway.c @@ -22,7 +22,7 @@ static int superhyway_devices; static struct device superhyway_bus_device = { - .bus_id = "superhyway", + .init_name = "superhyway", }; static void superhyway_device_release(struct device *dev) @@ -83,7 +83,7 @@ int superhyway_add_device(unsigned long base, struct superhyway_device *sdev, dev->id.id = dev->vcr.mod_id; sprintf(dev->name, "SuperHyway device %04x", dev->id.id); - sprintf(dev->dev.bus_id, "%02x", superhyway_devices); + dev_set_name(&dev->dev, "%02x", superhyway_devices); superhyway_devices++; |