From 3af1933a66cb1ff6d5c46475128e0944d2d0eba0 Mon Sep 17 00:00:00 2001 From: YONETANI Tomokazu Date: Sun, 30 Oct 2005 04:05:09 +0000 Subject: [PATCH] Unbreak `device pmtimer' for compiled-in acpi driver. It's only enabled when you compile the acpi driver in the kernel, since for i386 case, acpi.ko contains pmtimer code, so you don't need it in the kernel. --- sys/conf/files.i386 | 4 ++-- sys/config/LINT | 3 ++- sys/i386/conf/LINT | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 7669dc4971..a29e429663 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -2,7 +2,7 @@ # files marked standard are always included. # # $FreeBSD: src/sys/conf/files.i386,v 1.307.2.38 2003/01/02 20:41:33 kan Exp $ -# $DragonFly: src/sys/conf/Attic/files.i386,v 1.33 2005/08/16 10:31:35 y0netan1 Exp $ +# $DragonFly: src/sys/conf/Attic/files.i386,v 1.34 2005/10/30 04:05:09 y0netan1 Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -262,7 +262,7 @@ i386/isa/npx.c mandatory npx bus/iicbus/i386/pcf.c optional pcf bus/pci/i386/pci_cfgreg.c optional pci bus/pci/i386/pcibus.c optional pci -i386/isa/pmtimer.c optional acpi pmtimer +i386/isa/pmtimer.c optional pmtimer acpi # XXX drhodus i386/isa/prof_machdep.c optional profiling-routine dev/serial/rc/rc.c optional rc diff --git a/sys/config/LINT b/sys/config/LINT index c1e3d4f6bb..fa7239168a 100644 --- a/sys/config/LINT +++ b/sys/config/LINT @@ -3,7 +3,7 @@ # as much of the source tree as it can. # # $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $ -# $DragonFly: src/sys/config/LINT,v 1.64 2005/10/18 15:31:10 sephe Exp $ +# $DragonFly: src/sys/config/LINT,v 1.65 2005/10/30 04:05:09 y0netan1 Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -2603,6 +2603,7 @@ options UBSEC_DEBUG # enable debugging support: hw.ubsec.debug options UBSEC_RNDTEST # enable rndtest support device acpi # basic ACPI support +device pmtimer # adjust the system clock after resume # DRM options: # mgadrm: AGP Matrox G200, G400, G450, G550 diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 092c3a805c..69b7081c7f 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -3,7 +3,7 @@ # as much of the source tree as it can. # # $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $ -# $DragonFly: src/sys/i386/conf/Attic/LINT,v 1.64 2005/10/18 15:31:10 sephe Exp $ +# $DragonFly: src/sys/i386/conf/Attic/LINT,v 1.65 2005/10/30 04:05:09 y0netan1 Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -2603,6 +2603,7 @@ options UBSEC_DEBUG # enable debugging support: hw.ubsec.debug options UBSEC_RNDTEST # enable rndtest support device acpi # basic ACPI support +device pmtimer # adjust the system clock after resume # DRM options: # mgadrm: AGP Matrox G200, G400, G450, G550 -- 2.41.0