diff options
| author | Gordon Willem Klok <gwk@cvs.openbsd.org> | 2006-12-06 20:38:15 +0000 |
|---|---|---|
| committer | Gordon Willem Klok <gwk@cvs.openbsd.org> | 2006-12-06 20:38:15 +0000 |
| commit | f2a4cd45071773673f2c518c5078a804e7cc0cc1 (patch) | |
| tree | c8ded30fed2bd99c484b849ac2596064eb7906d2 /sys/arch/macppc | |
| parent | ee067f2a7644d78d14c244fabbfe86f41e843d7e (diff) | |
Enable mesh and mc device drivers in GENERIC, booting on old world macs is
pointless without these two.
ok martin@, deraadt@ durring h2k6
Diffstat (limited to 'sys/arch/macppc')
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 8 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/files.macppc | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 4de131289b1..bb46d458ab4 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.154 2006/11/28 18:53:22 dlg Exp $g +# $OpenBSD: GENERIC,v 1.155 2006/12/06 20:38:14 gwk Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -135,9 +135,9 @@ pwdog0 at pci? # Quancom PWDOG1 watchdog timer macintr0 at macobio? # old interrupt controller openpic* at macobio? # openpic interrupt controller bm* at macobio? # BMAC ethernet -#mc* at macobio? # MACE ethernet +mc* at macobio? # MACE ethernet #esp* at macobio? flags 0x0000ffff # 53c9x SCSI -#mesh* at macobio? flags 0xffff # MESH SCSI +mesh* at macobio? flags 0xffff # MESH SCSI #nvram* at macobio? # nvram adb* at macobio? # Apple Desktop Bus apm0 at adb? # APM emulation @@ -177,7 +177,7 @@ scsibus* at ahc? #scsibus* at ami? #scsibus* at bha? #scsibus* at esp? -#scsibus* at mesh? +scsibus* at mesh? scsibus* at ioprbs? scsibus* at iopsp? scsibus* at pcscp? diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc index be1c21a5815..b2f21e91046 100644 --- a/sys/arch/macppc/conf/files.macppc +++ b/sys/arch/macppc/conf/files.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: files.macppc,v 1.49 2006/09/27 06:33:03 grange Exp $ +# $OpenBSD: files.macppc,v 1.50 2006/12/06 20:38:14 gwk Exp $ # # macppc-specific configuration info @@ -128,10 +128,9 @@ device mesh: scsi attach mesh at macobio file arch/macppc/dev/mesh.c mesh -#device mc: ifnet, ether -#attach mc at macobio -#file arch/macppc/dev/if_mc.c mc -#file arch/macppc/dev/am79c950.c mc +device mc: ifnet, ether +attach mc at macobio +file arch/macppc/dev/if_mc.c mc device bm: ether, ifnet, ifmedia, mii, mii_bitbang attach bm at macobio |