I fixed this in my tree as follows:
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/11/05 15:57:06-08:00 davem@xxxxxxxxxxxxxxxxxx
# [SUNGEM]: Use CONFIG_PPC_PMAC throughout.
#
# Fixes some build failures ala bugme bugzilla #3706
#
# Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
#
# drivers/net/sungem.c
# 2004/11/05 15:56:15-08:00 davem@xxxxxxxxxxxxxxxxxx +1 -1
# [SUNGEM]: Use CONFIG_PPC_PMAC throughout.
#
diff -Nru a/drivers/net/sungem.c b/drivers/net/sungem.c
--- a/drivers/net/sungem.c 2004-11-05 15:57:28 -08:00
+++ b/drivers/net/sungem.c 2004-11-05 15:57:28 -08:00
@@ -2681,7 +2681,7 @@
return rc;
}
-#if (!defined(__sparc__) && !defined(CONFIG_PPC))
+#if (!defined(__sparc__) && !defined(CONFIG_PPC_PMAC))
/* Fetch MAC address from vital product data of PCI ROM. */
static void find_eth_addr_in_vpd(void __iomem *rom_base, int len, unsigned
char *dev_addr)
{
|