diff options
Diffstat (limited to 'drivers/net/tulip/de4x5.c')
-rw-r--r-- | drivers/net/tulip/de4x5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index f8a45253eaf8..67bfd6f43366 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c | |||
@@ -1118,7 +1118,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev) | |||
1118 | } | 1118 | } |
1119 | 1119 | ||
1120 | dev->base_addr = iobase; | 1120 | dev->base_addr = iobase; |
1121 | printk ("%s: %s at 0x%04lx", gendev->bus_id, name, iobase); | 1121 | printk ("%s: %s at 0x%04lx", dev_name(gendev), name, iobase); |
1122 | 1122 | ||
1123 | status = get_hw_addr(dev); | 1123 | status = get_hw_addr(dev); |
1124 | printk(", h/w address %pM\n", dev->dev_addr); | 1124 | printk(", h/w address %pM\n", dev->dev_addr); |
@@ -1153,7 +1153,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev) | |||
1153 | } | 1153 | } |
1154 | } | 1154 | } |
1155 | lp->fdx = lp->params.fdx; | 1155 | lp->fdx = lp->params.fdx; |
1156 | sprintf(lp->adapter_name,"%s (%s)", name, gendev->bus_id); | 1156 | sprintf(lp->adapter_name,"%s (%s)", name, dev_name(gendev)); |
1157 | 1157 | ||
1158 | lp->dma_size = (NUM_RX_DESC + NUM_TX_DESC) * sizeof(struct de4x5_desc); | 1158 | lp->dma_size = (NUM_RX_DESC + NUM_TX_DESC) * sizeof(struct de4x5_desc); |
1159 | #if defined(__alpha__) || defined(__powerpc__) || defined(CONFIG_SPARC) || defined(DE4X5_DO_MEMCPY) | 1159 | #if defined(__alpha__) || defined(__powerpc__) || defined(CONFIG_SPARC) || defined(DE4X5_DO_MEMCPY) |