diff options
| author | peter <peter@FreeBSD.org> | 2003-05-31 07:00:08 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2003-05-31 07:00:08 +0000 |
| commit | 0cb8f83a58154d726388c5d4e1baff564c2565b6 (patch) | |
| tree | 3296e968f0f0d337291baf31ae583f62cc2a261a /sys | |
| parent | d5cee515b42fd4184742629c43e6a43ee2e5200c (diff) | |
| download | FreeBSD-src-0cb8f83a58154d726388c5d4e1baff564c2565b6.zip FreeBSD-src-0cb8f83a58154d726388c5d4e1baff564c2565b6.tar.gz | |
Add acpi to the build. Remove the hack from machdep.c that lies to the
loader to shut it up.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 2 | ||||
| -rw-r--r-- | sys/amd64/conf/GENERIC | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index d751a7a..47f4b79 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1645,5 +1645,3 @@ outb(u_int port, u_char data) } #endif /* DDB */ - -MODULE_VERSION(acpi, 100); diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 2e058e9..04de75d 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -26,6 +26,7 @@ options IA32 options COMPAT_FREEBSD4 makeoptions NO_MODULES=not_yet +#makeoptions DEBUG=-g #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. @@ -42,6 +43,9 @@ options NFS_ROOT #NFS usable as root device, requires NFSCLIENT # Debugging for use in -current options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +#options DDB +#options ALT_BREAK_TO_DEBUGGER +#options WITNESS options SYSVMSG options SYSVSEM @@ -49,13 +53,15 @@ options SYSVSHM device isa device pci +device acpi +#options ACPI_DEBUG # ATA and ATAPI devices device ata device atadisk # ATA disk drives device atapicd # ATAPI CDROM drives -options KTRACE +options KTRACE # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller |
