Index: projects/altix/sys/ia64/conf/ALTIX
===================================================================
--- projects/altix/sys/ia64/conf/ALTIX	(revision 221481)
+++ projects/altix/sys/ia64/conf/ALTIX	(revision 221482)
@@ -1,70 +1,68 @@
 # $FreeBSD$
 
 cpu		ITANIUM2
 ident		ALTIX
 
 makeoptions	DEBUG=-g
 makeoptions	MODULES_OVERRIDE=""
 
 device		ata
 device		atadisk
 device		bge
 device		bpf
 device		da
 device		ether
 device		firmware
 device		isp
 device		loop
 device		md
 device		miibus
 device		pass
 device		pci
 device		pty
 device		random
 device		scbus
 device		tun
 device		uart
 device		vlan
 
-#options 	ACPI_DEBUG
 options 	ALT_BREAK_TO_DEBUGGER
 options 	CD9660
 options 	DDB
 options 	DEADLKRES
-#options 	EXCEPTION_TRACING
 options 	FFS
 options 	GDB
 options 	INET
 options 	INET6
 options 	INVARIANTS
 options 	INVARIANT_SUPPORT
 options 	KDB
 options 	KTRACE
 options 	MD_ROOT
 options 	MSDOSFS
 options 	NFSCL
 options 	NFSLOCKD
 options 	NFS_ROOT
 options 	NULLFS
 options 	P1003_1B_SEMAPHORES
 #options 	PREEMPTION
 options 	PRINTF_BUFR_SIZE=128
 options 	PROCFS
 options 	PSEUDOFS
 options 	SCHED_ULE
 options 	SCSI_DELAY=3000
-#options 	SMP
+options 	SMP
 options 	SOFTUPDATES
 options 	SYSVMSG
 options 	SYSVSEM
 options 	SYSVSHM
 options 	TMPFS
 options 	UFS_DIRHASH
 options 	WITNESS
 options 	WITNESS_SKIPSPIN
 options 	_KPOSIX_PRIORITY_SCHEDULING
 
 #options 	KTR
 #options 	KTR_COMPILE=KTR_INTR
 #options 	KTR_MASK=KTR_INTR
 #options 	KTR_VERBOSE