diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC.MP | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK | 8 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKB | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 4 |
6 files changed, 18 insertions, 10 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 8165d129ae0..2fd5d670c1d 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.644 2008/12/01 23:48:46 todd Exp $ +# $OpenBSD: GENERIC,v 1.645 2008/12/26 17:10:45 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -40,6 +40,7 @@ mainbus0 at root cpu0 at mainbus? bios0 at mainbus0 +ioapic* at mainbus? apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 acpi0 at bios? pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose @@ -56,6 +57,7 @@ acpibtn* at acpi? acpicpu* at acpi? #acpidock* at acpi? acpiec* at acpi? +acpimadt0 at acpi? acpiprt* at acpi? acpitz* at acpi? acpiasus* at acpi? diff --git a/sys/arch/i386/conf/GENERIC.MP b/sys/arch/i386/conf/GENERIC.MP index a7f4dc36ab9..14e593a190e 100644 --- a/sys/arch/i386/conf/GENERIC.MP +++ b/sys/arch/i386/conf/GENERIC.MP @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC.MP,v 1.7 2007/01/27 22:41:40 kettenis Exp $ +# $OpenBSD: GENERIC.MP,v 1.8 2008/12/26 17:10:45 deraadt Exp $ # # GENERIC.MP - sample multiprocessor kernel # @@ -8,5 +8,3 @@ include "arch/i386/conf/GENERIC" option MULTIPROCESSOR # Multiple processor support cpu* at mainbus? -ioapic* at mainbus? -acpimadt0 at acpi? diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index 02463a9741a..d4d8caad710 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.164 2008/09/08 05:36:29 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.165 2008/12/26 17:10:45 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -41,11 +41,13 @@ acpi0 at bios? #acpibtn* at acpi? #acpicpu* at acpi? #acpiec* at acpi? +acpimadt0 at acpi? acpiprt* at acpi? #acpitz* at acpi? cpu0 at mainbus? bios0 at mainbus0 +ioapic* at mainbus? apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 #option APMDEBUG pcibios0 at bios0 flags 0x0000 @@ -204,7 +206,7 @@ ne* at isapnp? # NE[12]000 PnP ethernet cards #el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? # 3C509 ethernet cards ep* at isa? # 3C509 ethernet cards -ef* at isapnp? # 3C515 PnP ethernet +#ef* at isapnp? # 3C515 PnP ethernet #ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 #ie1 at isa? port 0x300 irq 10 # EtherExpress le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA @@ -226,7 +228,7 @@ ep* at pcmcia? # PCMCIA based 3c5xx cards #fpa* at pci? # DEC DEFPA FDDI cards xl* at pci? # 3C9xx ethernet cards rl* at pci? # RealTek 81[23]9 ethernet -epic* at pci? # SMC EPIC/100 ethernet +#epic* at pci? # SMC EPIC/100 ethernet tl* at pci? # Compaq Thunderlan ethernet cards vr* at pci? # VIA Rhine ethernet #wb* at pci? # Winbond W89C840F ethernet diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index 9346b29faec..fd3df6750d8 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.109 2008/11/25 18:55:01 deraadt Exp $ +# $OpenBSD: RAMDISKB,v 1.110 2008/12/26 17:10:45 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -41,11 +41,13 @@ acpi0 at bios? #acpibtn* at acpi? #acpicpu* at acpi? #acpiec* at acpi? +acpimadt0 at acpi? acpiprt* at acpi? #acpitz* at acpi? cpu0 at mainbus? bios0 at mainbus0 +ioapic* at mainbus? apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 #option APMDEBUG pcibios0 at bios0 flags 0x0000 diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index f1142686997..0bfbdee9f79 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.89 2008/09/08 05:36:29 deraadt Exp $ +# $OpenBSD: RAMDISKC,v 1.90 2008/12/26 17:10:45 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -41,11 +41,13 @@ acpi0 at bios? #acpibtn* at acpi? #acpicpu* at acpi? #acpiec* at acpi? +acpimadt0 at acpi? acpiprt* at acpi? #acpitz* at acpi? cpu0 at mainbus? bios0 at mainbus0 +ioapic* at mainbus? apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 #option APMDEBUG pcibios0 at bios0 flags 0x0000 diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 432be7ae4d0..508bad5c448 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.160 2008/10/23 17:26:26 deraadt Exp $ +# $OpenBSD: RAMDISK_CD,v 1.161 2008/12/26 17:10:45 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -45,11 +45,13 @@ acpi0 at bios? #acpibtn* at acpi? #acpicpu* at acpi? #acpiec* at acpi? +acpimadt0 at acpi? acpiprt* at acpi? #acpitz* at acpi? cpu0 at mainbus? bios0 at mainbus0 +ioapic* at mainbus? apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 #option APMDEBUG pcibios0 at bios0 flags 0x0000 |