git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../linux-2.6
[safe/jmp/linux-2.6]
/
drivers
/
net
/
tulip
/
de4x5.c
diff --git
a/drivers/net/tulip/de4x5.c
b/drivers/net/tulip/de4x5.c
index
d1a86a0
..
f560941
100644
(file)
--- a/
drivers/net/tulip/de4x5.c
+++ b/
drivers/net/tulip/de4x5.c
@@
-4160,7
+4160,7
@@
get_hw_addr(struct net_device *dev)
** If the address starts with 00 a0, we have to bit-reverse
** each byte of the address.
*/
- if (
(_machine & _MACH_P
mac) &&
+ if (
machine_is(power
mac) &&
(dev->dev_addr[0] == 0) &&
(dev->dev_addr[1] == 0xa0) )
{