diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-02-25 14:36:50 -0500 |
|---|---|---|
| committer | Christoph Hellwig <hch@sgi.com> | 2004-02-25 14:36:50 -0500 |
| commit | d25843bd76aa793e4076a7f3c64974bdaf341db4 (patch) | |
| tree | 74f663d185be6e110f44da8bc3539b1cf702adee | |
| parent | 540357d72ef461cadd6e4ad06e42f113c4956537 (diff) | |
[PATCH] ppc64: fix de4x5 build
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
It should be _machine, not ppc_machine.
| -rw-r--r-- | drivers/net/tulip/de4x5.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index 78ee02e19451..90a0fca56f84 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c @@ -474,9 +474,9 @@ #include <asm/byteorder.h> #include <asm/unaligned.h> #include <asm/uaccess.h> -#ifdef CONFIG_PPC +#ifdef CONFIG_PPC_MULTIPLATFORM #include <asm/machdep.h> -#endif /* CONFIG_PPC */ +#endif /* CONFIG_PPC_MULTIPLATFORM */ #include "de4x5.h" @@ -4146,12 +4146,12 @@ get_hw_addr(struct net_device *dev) /* If possible, try to fix a broken card - SMC only so far */ srom_repair(dev, broken); -#ifdef CONFIG_PPC +#ifdef CONFIG_PPC_MULTIPLATFORM /* ** If the address starts with 00 a0, we have to bit-reverse ** each byte of the address. */ - if ( (ppc_md.ppc_machine & _MACH_Pmac) && + if ( (_machine & _MACH_Pmac) && (dev->dev_addr[0] == 0) && (dev->dev_addr[1] == 0xa0) ) { @@ -4163,7 +4163,7 @@ get_hw_addr(struct net_device *dev) dev->dev_addr[i] = ((x & 0x55) << 1) + ((x & 0xaa) >> 1); } } -#endif /* CONFIG_PPC */ +#endif /* CONFIG_PPC_MULTIPLATFORM */ /* Test for a bad enet address */ status = test_bad_enet(dev, status); |