diff --git a/kernel/busses/Module.mk b/kernel/busses/Module.mk
index 991c079f..18b8c7e6 100644
--- a/kernel/busses/Module.mk
+++ b/kernel/busses/Module.mk
@@ -29,13 +29,8 @@ ifeq ($(shell if grep -q '^CONFIG_IPMI_HANDLER=' $(LINUX)/.config; then echo 1;
 KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-ipmb.o
 KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-ipmi.o
 endif
+
 # These targets ARE included in 'mkpatch' ...
-ifneq ($(shell if grep -q '^CONFIG_I2C_SIS630=y' $(LINUX)/.config; then echo 1; fi),1)
-KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-sis630.o
-endif
-ifneq ($(shell if grep -q '^CONFIG_I2C_SIS645=y' $(LINUX)/.config; then echo 1; fi),1)
-KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-sis645.o
-endif
 ifneq ($(shell if grep -q '^CONFIG_I2C_ALI1535=y' $(LINUX)/.config; then echo 1; fi),1)
 KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-ali1535.o
 endif
@@ -63,8 +58,18 @@ endif
 ifneq ($(shell if grep -q '^CONFIG_I2C_SIS5595=y' $(LINUX)/.config; then echo 1; fi),1)
 KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-sis5595.o
 endif
+ifneq ($(shell if grep -q '^CONFIG_I2C_SIS630=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-sis630.o
+endif
+ifneq ($(shell if grep -q '^CONFIG_I2C_SIS645=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-sis645.o
+endif
+# don't compile dmi_scan unless x86 because it needs isa access
 ifneq ($(shell if grep -q '^CONFIG_I2C_PIIX4=y' $(LINUX)/.config; then echo 1; fi),1)
-KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-piix4.o $(MODULE_DIR)/dmi_scan.o
+KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-piix4.o
+ifeq ($(shell if grep -q '^CONFIG_X86=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELBUSSESTARGETS += $(MODULE_DIR)/dmi_scan.o
+endif
 endif
 ifneq ($(shell if grep -q '^CONFIG_I2C_SAVAGE4=y' $(LINUX)/.config; then echo 1; fi),1)
 KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-savage4.o