diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2020-09-12 07:47:28 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2020-09-12 07:47:28 +0000 |
| commit | 53880365d8af3f62a4430109f54a2a8867384b36 (patch) | |
| tree | 1a8bd896b7addac7272c692255079894fc54ac07 /sys/arch | |
| parent | 518d7e02e4673edfa16c13a28b7cecb1cac01847 (diff) | |
Make asmc(4) attach through acpi(4) instead of isa(4).
This e.g. makes the driver also work on iMac11,2.
ok kettenis@, jung@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 2c49f91a1b1..21e979ad229 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.490 2020/06/02 16:24:24 jcs Exp $ +# $OpenBSD: GENERIC,v 1.491 2020/09/12 07:47:26 mglocker Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -68,6 +68,7 @@ glkgpio* at acpi? sdhc* at acpi? acpicbkbd* at acpi? acpials* at acpi? +asmc0 at acpi? # Apple SMC tpm* at acpi? acpihve* at acpi? acpisurface* at acpi? @@ -132,7 +133,6 @@ lm* at wbsio? uguru0 at isa? disable port 0xe0 # ABIT uGuru aps0 at isa? port 0x1600 # ThinkPad Active Protection System -asmc0 at isa? port 0x300 # Apple SMC piixpm* at pci? # Intel PIIX PM iic* at piixpm? diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 0c0d8d1eb95..0067d403f9d 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.851 2020/06/22 00:33:28 dlg Exp $ +# $OpenBSD: GENERIC,v 1.852 2020/09/12 07:47:26 mglocker Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -62,6 +62,7 @@ acpivideo* at acpi? acpivout* at acpivideo? acpipwrres* at acpi? aibs* at acpi? +asmc0 at acpi? # Apple SMC option PCIVERBOSE option EISAVERBOSE @@ -148,7 +149,6 @@ uguru0 at isa? disable port 0xe0 # ABIT uGuru fins0 at isa? port 0x4e # Fintek F71805 Super I/O aps0 at isa? port 0x1600 # ThinkPad Active Protection System -asmc0 at isa? port 0x300 # Apple SMC itherm* at pci? # Intel 3400 Thermal Sensor adc* at iic? # Analog Devices AD7416/AD7417/7418 |