From: rahnds <rahnds@openbsd.org>
Date: Sat, 25 Mar 2000 15:26:26 +0000 (+0000)
Subject: if_gm attaches on pci, not macobio.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9867707ae98cb03d713845fbfe44ce4c990f0a01;p=openbsd

if_gm attaches on pci, not macobio.
---

diff --git a/sys/arch/powerpc/conf/GENERICMAC b/sys/arch/powerpc/conf/GENERICMAC
index 844c9615cfe..dff7211c3ea 100644
--- a/sys/arch/powerpc/conf/GENERICMAC
+++ b/sys/arch/powerpc/conf/GENERICMAC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERICMAC,v 1.6 2000/03/23 04:08:12 rahnds Exp $
+#	$OpenBSD: GENERICMAC,v 1.7 2000/03/25 15:26:26 rahnds Exp $
 #
 # PPC GENERIC config file
 #
@@ -53,6 +53,7 @@ de*		at pci? dev ? function ?
 #pciide*		at pci? dev ? function ?
 #macofcons0 at pci? dev ? function ?    # OpenFirmware console (for debugging)
 obio0   at pci? dev ? function ?
+gm*     at pci? dev ? function ?       		# gmac ethernet  G4 
 
 # how many of these are needed?
 exphy*  at mii? phy ?                   # 3Com internal PHYs
@@ -72,7 +73,6 @@ ukphy*  at mii? phy ?                   # generic unknown PHYs
 macintr0 at obio?                        # old interrupt controller
 openpic0 at obio?                        # openpic interrupt controller
 bm*     at obio?                        # bmac ethernet
-gm*     at obio?                        # gmac ethernet  G4 
 #mc*     at obio?                        # MACE ethernet
 #esp*    at obio? flags 0x00ff           # 53c9x SCSI
 #mesh*   at obio? flags 0xffff           # MESH SCSI
diff --git a/sys/arch/powerpc/conf/RAMDISKMAC b/sys/arch/powerpc/conf/RAMDISKMAC
index 3c8aee9e1bc..8515b0fbb18 100644
--- a/sys/arch/powerpc/conf/RAMDISKMAC
+++ b/sys/arch/powerpc/conf/RAMDISKMAC
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKMAC,v 1.6 2000/03/23 04:08:12 rahnds Exp $
+#	$OpenBSD: RAMDISKMAC,v 1.7 2000/03/25 15:26:26 rahnds Exp $
 #
 # PPC GENERIC config file
 #
@@ -69,6 +69,7 @@ de*		at pci? dev ? function ?
 #pciide*		at pci? dev ? function ?
 #macofcons0 at pci? dev ? function ?    # OpenFirmware console (for debugging)
 obio0   at pci? dev ? function ?
+gm*     at pci? dev ? function ?       		# gmac ethernet  G4 
 
 # how many of these are needed?
 exphy*  at mii? phy ?                   # 3Com internal PHYs
@@ -95,7 +96,6 @@ ukphy*  at mii? phy ?                   # generic unknown PHYs
 macintr0 at obio?                        # old interrupt controller
 openpic0 at obio?                        # openpic interrupt controller
 bm*     at obio?                        # bmac ethernet
-gm*     at obio?                        # gmac ethernet  G4 
 #mc*     at obio?                        # MACE ethernet
 #esp*    at obio? flags 0x00ff           # 53c9x SCSI
 #mesh*   at obio? flags 0xffff           # MESH SCSI
diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc
index 630c2581f48..8c00c5131e1 100644
--- a/sys/arch/powerpc/conf/files.powerpc
+++ b/sys/arch/powerpc/conf/files.powerpc
@@ -162,7 +162,7 @@ attach bm at obio
 file arch/powerpc/mac/if_bm.c			bm
 
 device gm: ether, ifnet, ifmedia, mii
-attach gm at obio
+attach gm at pci
 file arch/powerpc/mac/if_gm.c			gm
 
 device macintr {}