diff options
Diffstat (limited to 'drivers/net/ethernet/amd/ariadne.c')
-rw-r--r-- | drivers/net/ethernet/amd/ariadne.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/ariadne.c index 33822cb69366..b08101b31b8b 100644 --- a/drivers/net/ethernet/amd/ariadne.c +++ b/drivers/net/ethernet/amd/ariadne.c | |||
@@ -51,6 +51,7 @@ | |||
51 | #include <linux/zorro.h> | 51 | #include <linux/zorro.h> |
52 | #include <linux/bitops.h> | 52 | #include <linux/bitops.h> |
53 | 53 | ||
54 | #include <asm/byteorder.h> | ||
54 | #include <asm/amigaints.h> | 55 | #include <asm/amigaints.h> |
55 | #include <asm/amigahw.h> | 56 | #include <asm/amigahw.h> |
56 | #include <asm/irq.h> | 57 | #include <asm/irq.h> |
@@ -718,6 +719,7 @@ static int ariadne_init_one(struct zorro_dev *z, | |||
718 | struct resource *r1, *r2; | 719 | struct resource *r1, *r2; |
719 | struct net_device *dev; | 720 | struct net_device *dev; |
720 | struct ariadne_private *priv; | 721 | struct ariadne_private *priv; |
722 | u32 serial; | ||
721 | int err; | 723 | int err; |
722 | 724 | ||
723 | r1 = request_mem_region(base_addr, sizeof(struct Am79C960), "Am79C960"); | 725 | r1 = request_mem_region(base_addr, sizeof(struct Am79C960), "Am79C960"); |
@@ -741,12 +743,13 @@ static int ariadne_init_one(struct zorro_dev *z, | |||
741 | r1->name = dev->name; | 743 | r1->name = dev->name; |
742 | r2->name = dev->name; | 744 | r2->name = dev->name; |
743 | 745 | ||
746 | serial = be32_to_cpu(z->rom.er_SerialNumber); | ||
744 | dev->dev_addr[0] = 0x00; | 747 | dev->dev_addr[0] = 0x00; |
745 | dev->dev_addr[1] = 0x60; | 748 | dev->dev_addr[1] = 0x60; |
746 | dev->dev_addr[2] = 0x30; | 749 | dev->dev_addr[2] = 0x30; |
747 | dev->dev_addr[3] = (z->rom.er_SerialNumber >> 16) & 0xff; | 750 | dev->dev_addr[3] = (serial >> 16) & 0xff; |
748 | dev->dev_addr[4] = (z->rom.er_SerialNumber >> 8) & 0xff; | 751 | dev->dev_addr[4] = (serial >> 8) & 0xff; |
749 | dev->dev_addr[5] = z->rom.er_SerialNumber & 0xff; | 752 | dev->dev_addr[5] = serial & 0xff; |
750 | dev->base_addr = (unsigned long)ZTWO_VADDR(base_addr); | 753 | dev->base_addr = (unsigned long)ZTWO_VADDR(base_addr); |
751 | dev->mem_start = (unsigned long)ZTWO_VADDR(mem_start); | 754 | dev->mem_start = (unsigned long)ZTWO_VADDR(mem_start); |
752 | dev->mem_end = dev->mem_start + ARIADNE_RAM_SIZE; | 755 | dev->mem_end = dev->mem_start + ARIADNE_RAM_SIZE; |