diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 4ee9a90248f1..225bfef0ae7f 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -226,12 +226,11 @@ options 	DRM_DEBUG	# Include debug printfs (slow)
 # lnc:  Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and
 #       Am79C960)
 
-#XXX#	still calls MD i386 kvtop function instead of vtophys etc
-#XXX#device		ed
-#XXX#options 		ED_3C503
-#XXX#options 		ED_HPP
-#XXX#options 		ED_SIC
-#XXX#device		lnc
+device		ed
+options 	ED_3C503
+options 	ED_HPP
+options 	ED_SIC
+device		lnc
 
 device		ath
 device		ath_hal		# Atheros HAL (includes binary component)
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 4bfda27e88c7..c4ec1e51b967 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -136,6 +136,12 @@ dev/atkbdc/atkbdc.c		optional	atkbdc
 dev/atkbdc/atkbdc_isa.c		optional	atkbdc isa
 dev/atkbdc/atkbdc_subr.c	optional	atkbdc
 dev/atkbdc/psm.c		optional	psm atkbdc
+# There are no systems with isa slots, so all ed isa entries should go..
+dev/ed/if_ed_3c503.c		optional	ed isa ed_3c503
+dev/ed/if_ed_isa.c		optional	ed isa
+dev/ed/if_ed_wd80x3.c		optional	ed isa
+dev/ed/if_ed_hpp.c		optional	ed isa ed_hpp
+dev/ed/if_ed_sic.c		optional	ed isa ed_sic
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	vga
 dev/fb/splash.c			optional	splash