From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
It should be _machine, not ppc_machine.
---
drivers/net/tulip/de4x5.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff -puN drivers/net/tulip/de4x5.c~ppc64-tulip-build-fix drivers/net/tulip/de4x5.c
--- 25/drivers/net/tulip/de4x5.c~ppc64-tulip-build-fix 2004-02-18 18:45:27.000000000 -0800
+++ 25-akpm/drivers/net/tulip/de4x5.c 2004-02-18 18:45:27.000000000 -0800
@@ -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);
_