commit f877958879d413c37bfbeb7517614f3625cdea38
author Finn Thain <fthain@telegraphics.com.au> Tue May 01 22:32:53 2007 +0200
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Fri May 04 17:59:07 2007 -0700
tree 9a7956804b2a2299279c5896c9a70fed77254815
parent e10e5c4325b37e1a7dce9cd3d2cbcd8dd9536a7a

NuBus header update

Sync the nubus defines with the latest code in the mac68k repo. Some of these
are needed for DP8390 driver update in the next patch.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

drivers/net/macsonic.c

diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index 8ca57a0..a3d24a3 100644
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -402,7 +402,7 @@
 	    ndev->dr_sw == NUBUS_DRSW_DAYNA)
 		return MACSONIC_DAYNA;
 
-	if (ndev->dr_hw == NUBUS_DRHW_SONIC_LC &&
+	if (ndev->dr_hw == NUBUS_DRHW_APPLE_SONIC_LC &&
 	    ndev->dr_sw == 0) { /* huh? */
 		return MACSONIC_APPLE16;
 	}