diff --git a/kernel/busses/Module.mk b/kernel/busses/Module.mk
index 236da3d5..222c805c 100644
--- a/kernel/busses/Module.mk
+++ b/kernel/busses/Module.mk
@@ -24,7 +24,7 @@ KERNELBUSSESDIR := $(MODULE_DIR)
 # Regrettably, even 'simply expanded variables' will not put their currently
 # defined value verbatim into the command-list of rules...
 # These targets are NOT included in 'mkpatch' ...
-KERNELBUSSESTARGETS := $(MODULE_DIR)/i2c-savage4.o
+
 
 # These targets ARE included in 'mkpatch' ...
 ifneq ($(shell if grep -q '^CONFIG_I2C_ALI1535=y' $(LINUX)/.config; then echo 1; fi),1)
@@ -54,6 +54,9 @@ endif
 ifneq ($(shell if grep -q '^CONFIG_I2C_PIIX4=y' $(LINUX)/.config; then echo 1; fi),1)
 KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-piix4.o
 endif
+ifneq ($(shell if grep -q '^CONFIG_I2C_SAVAGE4=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-savage4.o
+endif
 # don't compile unless alpha because of kernel include-file dependencies
 ifeq ($(MACHINE),alpha)
 ifneq ($(shell if grep -q '^CONFIG_I2C_TSUNAMI=y' $(LINUX)/.config; then echo 1; fi),1)
diff --git a/kernel/chips/Module.mk b/kernel/chips/Module.mk
index b1871fad..6c401c64 100644
--- a/kernel/chips/Module.mk
+++ b/kernel/chips/Module.mk
@@ -24,10 +24,8 @@ KERNELCHIPSDIR := $(MODULE_DIR)
 # Regrettably, even 'simply expanded variables' will not put their currently
 # defined value verbatim into the command-list of rules...
 # These targets are NOT included in 'mkpatch' ...
-KERNELCHIPSTARGETS := $(MODULE_DIR)/pcf8591.o
 KERNELCHIPSTARGETS += $(MODULE_DIR)/smbus-arp.o
-KERNELCHIPSTARGETS += $(MODULE_DIR)/smsc47m1.o
-KERNELCHIPSTARGETS += $(MODULE_DIR)/vt1211.o
+
 
 # These targets ARE included in 'mkpatch', except for LTC1710, which we
 # leave here because it used to be in 'mkpatch' ...
@@ -82,6 +80,9 @@ endif
 ifneq ($(shell if grep -q '^CONFIG_SENSORS_LM87=y' $(LINUX)/.config; then echo 1; fi),1)
 KERNELCHIPSTARGETS += $(MODULE_DIR)/lm87.o
 endif
+ifneq ($(shell if grep -q '^CONFIG_SENSORS_LM92=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELCHIPSTARGETS += $(MODULE_DIR)/lm92.o
+endif
 ifneq ($(shell if grep -q '^CONFIG_SENSORS_LTC1710=y' $(LINUX)/.config; then echo 1; fi),1)
 KERNELCHIPSTARGETS += $(MODULE_DIR)/ltc1710.o
 endif
@@ -97,9 +98,15 @@ endif
 ifneq ($(shell if grep -q '^CONFIG_SENSORS_PCF8574=y' $(LINUX)/.config; then echo 1; fi),1)
 KERNELCHIPSTARGETS += $(MODULE_DIR)/pcf8574.o
 endif
+ifneq ($(shell if grep -q '^CONFIG_SENSORS_PCF8591=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELCHIPSTARGETS += $(MODULE_DIR)/pcf8591.o
+endif
 ifneq ($(shell if grep -q '^CONFIG_SENSORS_SIS5595=y' $(LINUX)/.config; then echo 1; fi),1)
 KERNELCHIPSTARGETS += $(MODULE_DIR)/sis5595.o
 endif
+ifneq ($(shell if grep -q '^CONFIG_SENSORS_SMSC47M1=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELCHIPSTARGETS += $(MODULE_DIR)/smsc47m1.o
+endif
 ifneq ($(shell if grep -q '^CONFIG_SENSORS_THMC50=y' $(LINUX)/.config; then echo 1; fi),1)
 KERNELCHIPSTARGETS += $(MODULE_DIR)/thmc50.o
 endif
@@ -109,8 +116,8 @@ endif
 ifneq ($(shell if grep -q '^CONFIG_SENSORS_VIA686A=y' $(LINUX)/.config; then echo 1; fi),1)
 KERNELCHIPSTARGETS += $(MODULE_DIR)/via686a.o
 endif
-ifneq ($(shell if grep -q '^CONFIG_SENSORS_LM92=y' $(LINUX)/.config; then echo 1; fi),1)
-KERNELCHIPSTARGETS += $(MODULE_DIR)/lm92.o
+ifneq ($(shell if grep -q '^CONFIG_SENSORS_VT1211=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELCHIPSTARGETS += $(MODULE_DIR)/vt1211.o
 endif
 
 # Include all dependency files
diff --git a/mkpatch/FILES b/mkpatch/FILES
index 9e15aa54..aae7281e 100644
--- a/mkpatch/FILES
+++ b/mkpatch/FILES
@@ -6,6 +6,7 @@ kernel/busses/i2c-i801.c	drivers/i2c/i2c-i801.c
 kernel/busses/i2c-i810.c	drivers/i2c/i2c-i810.c
 kernel/busses/i2c-isa.c		drivers/i2c/i2c-isa.c
 kernel/busses/i2c-piix4.c	drivers/i2c/i2c-piix4.c
+kernel/busses/i2c-savage4.c	drivers/i2c/i2c-savage4.c
 kernel/busses/i2c-sis5595.c	drivers/i2c/i2c-sis5595.c
 kernel/busses/i2c-tsunami.c	drivers/i2c/i2c-tsunami.c
 kernel/busses/i2c-via.c		drivers/i2c/i2c-via.c
@@ -29,12 +30,17 @@ kernel/chips/lm75.c		drivers/sensors/lm75.c
 kernel/chips/lm78.c		drivers/sensors/lm78.c
 kernel/chips/lm80.c		drivers/sensors/lm80.c
 kernel/chips/lm87.c		drivers/sensors/lm87.c
+kernel/chips/lm92.c		drivers/sensors/lm92.c
 kernel/chips/matorb.c		drivers/sensors/matorb.c
 kernel/chips/maxilife.c		drivers/sensors/maxilife.c
 kernel/chips/mtp008.c		drivers/sensors/mtp008.c
+kernel/chips/pcf8574.c		drivers/sensors/pcf8574.c
+kernel/chips/pcf8591.c		drivers/sensors/pcf8591.c
 kernel/chips/sis5595.c		drivers/sensors/sis5595.c
+kernel/chips/smsc47m1.c		drivers/sensors/smsc47m1.c
 kernel/chips/thmc50.c		drivers/sensors/thmc50.c
 kernel/chips/via686a.c		drivers/sensors/via686a.c
+kernel/chips/vt1211.c		drivers/sensors/vt1211.c
 kernel/chips/w83781d.c		drivers/sensors/w83781d.c
 kernel/include/sensors.h	include/linux/sensors.h
 kernel/include/sensors_vid.h	include/linux/sensors_vid.h