diff --git a/sys/arch/amiga/conf/DRACO b/sys/arch/amiga/conf/DRACO index be2e17895b8f..080da369d4fe 100644 --- a/sys/arch/amiga/conf/DRACO +++ b/sys/arch/amiga/conf/DRACO @@ -1,4 +1,4 @@ -# $NetBSD: DRACO,v 1.164 2013/01/29 21:06:15 rkujawa Exp $ +# $NetBSD: DRACO,v 1.165 2013/02/01 14:48:15 phx Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. @@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.164 $" +#ident "GENERIC-$Revision: 1.165 $" maxusers 8 diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC index e7f742bc3977..211b7e034b23 100644 --- a/sys/arch/amiga/conf/GENERIC +++ b/sys/arch/amiga/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.296 2013/01/29 21:06:16 rkujawa Exp $ +# $NetBSD: GENERIC,v 1.297 2013/02/01 14:48:15 phx Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. @@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.296 $" +#ident "GENERIC-$Revision: 1.297 $" maxusers 8 @@ -456,19 +456,21 @@ sd* at atapibus? drive ? # ATAPI disk drives pccard0 at mainbus0 pcmcia* at pccard0 -com* at pcmcia? function ? # Modems and serial cards -pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards -aic* at pcmcia? function ? # Adaptec APA-1460 SCSI +com* at pcmcia? function ? # Modems and serial cards +pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards +aic* at pcmcia? function ? # Adaptec APA-1460 SCSI wdc* at pcmcia? function ? -awi* at pcmcia? function ? # BayStack 650 (802.11FH) -ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet -mbe* at pcmcia? function ? # MB8696x based Ethernet -ne* at pcmcia? function ? # NE2000-compatible Ethernet -sm* at pcmcia? function ? # Megahertz Ethernet +awi* at pcmcia? function ? # BayStack 650 (802.11FH) +ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet +mbe* at pcmcia? function ? # MB8696x based Ethernet +ne* at pcmcia? function ? # NE2000-compatible Ethernet +sm* at pcmcia? function ? # Megahertz Ethernet mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards com* at mhzc? sm* at mhzc? +nsphyter* at mii? phy ? # NS83843 PHYs +ukphy* at mii? phy ? # generic unknown PHYs drsc0 at mainbus0 # DraCo scsi scsibus* at drsc0 diff --git a/sys/arch/amiga/conf/GENERIC.in b/sys/arch/amiga/conf/GENERIC.in index 00d87c4b2577..903f059721dc 100644 --- a/sys/arch/amiga/conf/GENERIC.in +++ b/sys/arch/amiga/conf/GENERIC.in @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.in,v 1.110 2013/01/29 21:04:55 rkujawa Exp $ +# $NetBSD: GENERIC.in,v 1.111 2013/02/01 14:48:15 phx Exp $ # ## # GENERIC machine description file @@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.110 $" +#ident "GENERIC-$Revision: 1.111 $" m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl makeoptions COPTS="-Os" @@ -537,19 +537,21 @@ sd* at atapibus? drive ? # ATAPI disk drives pccard0 at mainbus0 pcmcia* at pccard0 -com* at pcmcia? function ? # Modems and serial cards -pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards -aic* at pcmcia? function ? # Adaptec APA-1460 SCSI +com* at pcmcia? function ? # Modems and serial cards +pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards +aic* at pcmcia? function ? # Adaptec APA-1460 SCSI wdc* at pcmcia? function ? -awi* at pcmcia? function ? # BayStack 650 (802.11FH) -ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet -mbe* at pcmcia? function ? # MB8696x based Ethernet -ne* at pcmcia? function ? # NE2000-compatible Ethernet -sm* at pcmcia? function ? # Megahertz Ethernet +awi* at pcmcia? function ? # BayStack 650 (802.11FH) +ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet +mbe* at pcmcia? function ? # MB8696x based Ethernet +ne* at pcmcia? function ? # NE2000-compatible Ethernet +sm* at pcmcia? function ? # Megahertz Ethernet mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards com* at mhzc? sm* at mhzc? +nsphyter* at mii? phy ? # NS83843 PHYs +ukphy* at mii? phy ? # generic unknown PHYs ')m4_dnl m4_ifdef(`DRACO_CONFIGURATION', `m4_dnl diff --git a/sys/arch/amiga/conf/INSTALL b/sys/arch/amiga/conf/INSTALL index 84a6a8b74954..e07e0a8e77d9 100644 --- a/sys/arch/amiga/conf/INSTALL +++ b/sys/arch/amiga/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.115 2013/01/29 21:06:16 rkujawa Exp $ +# $NetBSD: INSTALL,v 1.116 2013/02/01 14:48:15 phx Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. @@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.115 $" +#ident "GENERIC-$Revision: 1.116 $" makeoptions COPTS="-Os" @@ -397,19 +397,21 @@ sd* at atapibus? drive ? # ATAPI disk drives pccard0 at mainbus0 pcmcia* at pccard0 -com* at pcmcia? function ? # Modems and serial cards -pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards -aic* at pcmcia? function ? # Adaptec APA-1460 SCSI +com* at pcmcia? function ? # Modems and serial cards +pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards +aic* at pcmcia? function ? # Adaptec APA-1460 SCSI wdc* at pcmcia? function ? -awi* at pcmcia? function ? # BayStack 650 (802.11FH) -ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet -mbe* at pcmcia? function ? # MB8696x based Ethernet -ne* at pcmcia? function ? # NE2000-compatible Ethernet -sm* at pcmcia? function ? # Megahertz Ethernet +awi* at pcmcia? function ? # BayStack 650 (802.11FH) +ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet +mbe* at pcmcia? function ? # MB8696x based Ethernet +ne* at pcmcia? function ? # NE2000-compatible Ethernet +sm* at pcmcia? function ? # Megahertz Ethernet mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards com* at mhzc? sm* at mhzc? +nsphyter* at mii? phy ? # NS83843 PHYs +ukphy* at mii? phy ? # generic unknown PHYs drsc0 at mainbus0 # DraCo scsi scsibus* at drsc0