diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index d751a7a9c79e..47f4b79eec73 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 2e058e97f588..04de75d351e9 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