From 08b00f49c361d36984755af7bb37cf57349941e2 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sun, 21 Oct 2001 06:05:08 +0000 Subject: [PATCH] MFi386: - sys/pc98/pc98/npx.c 1.87 (2001/09/15; author: imp) I don't think pc98 has acpi at all, so ifdef the acpi attachments for now. This completes merging sys/pc98/pc98/npx.c into sys/i386/isa/npx.c so that the former can be removed. --- sys/amd64/amd64/fpu.c | 2 ++ sys/amd64/isa/npx.c | 2 ++ sys/i386/isa/npx.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 1807ba915023..1238d67a6311 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -997,5 +997,7 @@ static driver_t npxisa_driver = { static devclass_t npxisa_devclass; DRIVER_MODULE(npxisa, isa, npxisa_driver, npxisa_devclass, 0, 0); +#ifndef PC98 DRIVER_MODULE(npxisa, acpi, npxisa_driver, npxisa_devclass, 0, 0); +#endif diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c index 1807ba915023..1238d67a6311 100644 --- a/sys/amd64/isa/npx.c +++ b/sys/amd64/isa/npx.c @@ -997,5 +997,7 @@ static driver_t npxisa_driver = { static devclass_t npxisa_devclass; DRIVER_MODULE(npxisa, isa, npxisa_driver, npxisa_devclass, 0, 0); +#ifndef PC98 DRIVER_MODULE(npxisa, acpi, npxisa_driver, npxisa_devclass, 0, 0); +#endif diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index 1807ba915023..1238d67a6311 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -997,5 +997,7 @@ static driver_t npxisa_driver = { static devclass_t npxisa_devclass; DRIVER_MODULE(npxisa, isa, npxisa_driver, npxisa_devclass, 0, 0); +#ifndef PC98 DRIVER_MODULE(npxisa, acpi, npxisa_driver, npxisa_devclass, 0, 0); +#endif