diff options
Diffstat (limited to 'drivers/eisa')
-rw-r--r-- | drivers/eisa/eisa-bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c index c950bf8606d9..66958b3f10b4 100644 --- a/drivers/eisa/eisa-bus.c +++ b/drivers/eisa/eisa-bus.c | |||
@@ -200,7 +200,7 @@ static int __init eisa_init_device (struct eisa_root_device *root, | |||
200 | edev->dev.bus = &eisa_bus_type; | 200 | edev->dev.bus = &eisa_bus_type; |
201 | edev->dev.dma_mask = &edev->dma_mask; | 201 | edev->dev.dma_mask = &edev->dma_mask; |
202 | edev->dev.coherent_dma_mask = edev->dma_mask; | 202 | edev->dev.coherent_dma_mask = edev->dma_mask; |
203 | sprintf (edev->dev.bus_id, "%02X:%02X", root->bus_nr, slot); | 203 | dev_set_name(&edev->dev, "%02X:%02X", root->bus_nr, slot); |
204 | 204 | ||
205 | for (i = 0; i < EISA_MAX_RESOURCES; i++) { | 205 | for (i = 0; i < EISA_MAX_RESOURCES; i++) { |
206 | #ifdef CONFIG_EISA_NAMES | 206 | #ifdef CONFIG_EISA_NAMES |
@@ -301,7 +301,7 @@ static int __init eisa_probe (struct eisa_root_device *root) | |||
301 | struct eisa_device *edev; | 301 | struct eisa_device *edev; |
302 | 302 | ||
303 | printk (KERN_INFO "EISA: Probing bus %d at %s\n", | 303 | printk (KERN_INFO "EISA: Probing bus %d at %s\n", |
304 | root->bus_nr, root->dev->bus_id); | 304 | root->bus_nr, dev_name(root->dev)); |
305 | 305 | ||
306 | /* First try to get hold of slot 0. If there is no device | 306 | /* First try to get hold of slot 0. If there is no device |
307 | * here, simply fail, unless root->force_probe is set. */ | 307 | * here, simply fail, unless root->force_probe is set. */ |