提交 bfaadcad 编写于 作者: S s.hauer@pengutronix.de 提交者: Paul Mackerras

[PATCH] Replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_PMAC in tulip driver

Replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_PMAC in
drivers/net/tulip/de4x5.c.  It is needed for a pmac specific hook but
has nothing with to do with PPC_MULTIPLATFORM.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Acked-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
上级 74a9d5f1
...@@ -473,9 +473,9 @@ ...@@ -473,9 +473,9 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#ifdef CONFIG_PPC_MULTIPLATFORM #ifdef CONFIG_PPC_PMAC
#include <asm/machdep.h> #include <asm/machdep.h>
#endif /* CONFIG_PPC_MULTIPLATFORM */ #endif /* CONFIG_PPC_PMAC */
#include "de4x5.h" #include "de4x5.h"
...@@ -4151,7 +4151,7 @@ get_hw_addr(struct net_device *dev) ...@@ -4151,7 +4151,7 @@ get_hw_addr(struct net_device *dev)
/* If possible, try to fix a broken card - SMC only so far */ /* If possible, try to fix a broken card - SMC only so far */
srom_repair(dev, broken); srom_repair(dev, broken);
#ifdef CONFIG_PPC_MULTIPLATFORM #ifdef CONFIG_PPC_PMAC
/* /*
** If the address starts with 00 a0, we have to bit-reverse ** If the address starts with 00 a0, we have to bit-reverse
** each byte of the address. ** each byte of the address.
...@@ -4168,7 +4168,7 @@ get_hw_addr(struct net_device *dev) ...@@ -4168,7 +4168,7 @@ get_hw_addr(struct net_device *dev)
dev->dev_addr[i] = ((x & 0x55) << 1) + ((x & 0xaa) >> 1); dev->dev_addr[i] = ((x & 0x55) << 1) + ((x & 0xaa) >> 1);
} }
} }
#endif /* CONFIG_PPC_MULTIPLATFORM */ #endif /* CONFIG_PPC_PMAC */
/* Test for a bad enet address */ /* Test for a bad enet address */
status = test_bad_enet(dev, status); status = test_bad_enet(dev, status);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册