Index: files
===================================================================
--- files	(revision 250223)
+++ files	(working copy)
@@ -1472,12 +1472,6 @@
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"ipw_monitor.fw"
-dev/iscsi/initiator/iscsi.c	optional iscsi_initiator scbus
-dev/iscsi/initiator/iscsi_subr.c	optional iscsi_initiator scbus
-dev/iscsi/initiator/isc_cam.c	optional iscsi_initiator scbus
-dev/iscsi/initiator/isc_soc.c	optional iscsi_initiator scbus
-dev/iscsi/initiator/isc_sm.c	optional iscsi_initiator scbus
-dev/iscsi/initiator/isc_subr.c	optional iscsi_initiator scbus
 dev/isf/isf.c			optional isf
 dev/isf/isf_fdt.c		optional isf fdt
 dev/isf/isf_nexus.c		optional isf
Index: files.amd64
===================================================================
--- files.amd64	(revision 250223)
+++ files.amd64	(working copy)
@@ -185,6 +185,13 @@
 dev/ipmi/ipmi_ssif.c		optional	ipmi smbus
 dev/ipmi/ipmi_pci.c		optional	ipmi pci
 dev/ipmi/ipmi_linux.c		optional	ipmi compat_linux32
+# iscsi(4) broken for non-x86 architectures.
+dev/iscsi/initiator/iscsi.c     optional iscsi_initiator scbus
+dev/iscsi/initiator/iscsi_subr.c        optional iscsi_initiator scbus
+dev/iscsi/initiator/isc_cam.c   optional iscsi_initiator scbus
+dev/iscsi/initiator/isc_soc.c   optional iscsi_initiator scbus
+dev/iscsi/initiator/isc_sm.c    optional iscsi_initiator scbus
+dev/iscsi/initiator/isc_subr.c  optional iscsi_initiator scbus
 dev/fdc/fdc.c			optional	fdc
 dev/fdc/fdc_acpi.c		optional	fdc
 dev/fdc/fdc_isa.c		optional	fdc isa
Index: files.i386
===================================================================
--- files.i386	(revision 250223)
+++ files.i386	(working copy)
@@ -216,6 +216,13 @@
 dev/ipmi/ipmi_ssif.c		optional ipmi smbus
 dev/ipmi/ipmi_pci.c		optional ipmi pci
 dev/ipmi/ipmi_linux.c		optional ipmi compat_linux
+# iscsi(4) broken for non-x86 architectures.
+dev/iscsi/initiator/iscsi.c     optional iscsi_initiator scbus
+dev/iscsi/initiator/iscsi_subr.c        optional iscsi_initiator scbus
+dev/iscsi/initiator/isc_cam.c   optional iscsi_initiator scbus
+dev/iscsi/initiator/isc_soc.c   optional iscsi_initiator scbus
+dev/iscsi/initiator/isc_sm.c    optional iscsi_initiator scbus
+dev/iscsi/initiator/isc_subr.c  optional iscsi_initiator scbus
 dev/kbd/kbd.c			optional atkbd | sc | ukbd
 dev/le/if_le_isa.c		optional le isa
 dev/lindev/full.c		optional lindev
Index: options
===================================================================
--- options	(revision 250223)
+++ options	(working copy)
@@ -358,9 +358,6 @@
 ISP_DEFAULT_ROLES	opt_isp.h
 ISP_INTERNAL_TARGET	opt_isp.h
 
-# Options used only in dev/iscsi
-ISCSI_INITIATOR_DEBUG	opt_iscsi_initiator.h
-
 # Net stuff.
 ACCEPT_FILTER_DATA
 ACCEPT_FILTER_DNS
Index: options.amd64
===================================================================
--- options.amd64	(revision 250223)
+++ options.amd64	(working copy)
@@ -69,6 +69,10 @@
 # options for the Intel C600 SAS driver (isci)
 ISCI_LOGGING	opt_isci.h
 
+
+# Options used only in dev/iscsi
+ISCSI_INITIATOR_DEBUG   opt_iscsi_initiator.h
+
 # hw random number generators for random(4)
 PADLOCK_RNG		opt_cpu.h
 RDRAND_RNG		opt_cpu.h
Index: options.i386
===================================================================
--- options.i386	(revision 250223)
+++ options.i386	(working copy)
@@ -124,6 +124,9 @@
 # options for the Intel C600 SAS driver (isci)
 ISCI_LOGGING	opt_isci.h
 
+# Options used only in dev/iscsi
+ISCSI_INITIATOR_DEBUG   opt_iscsi_initiator.h
+
 # hw random number generators for random(4)
 PADLOCK_RNG		opt_cpu.h
 RDRAND_RNG		opt_cpu.h