diff --git a/mkpatch/FILES b/mkpatch/FILES
index 87f61adf..a2330181 100644
--- a/mkpatch/FILES
+++ b/mkpatch/FILES
@@ -1,14 +1,14 @@
 kernel/busses/i2c-ali15x3.c	drivers/i2c/i2c-ali15x3.c
-kernel/busses/i2c-amd756.c	driver/i2c/i2c-amd756.c
-kernel/busses/i2c-hydra.c	driver/i2c/i2c-hydra.c
-kernel/busses/i2c-i801.c	driver/i2c/i2c-i801.c
-kernel/busses/i2c-i810.c	driver/i2c/i2c-i810.c
+kernel/busses/i2c-amd756.c	drivers/i2c/i2c-amd756.c
+kernel/busses/i2c-hydra.c	drivers/i2c/i2c-hydra.c
+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-sis5595.c	driver/i2c/i2c-sis5595.c
+kernel/busses/i2c-sis5595.c	drivers/i2c/i2c-sis5595.c
 kernel/busses/i2c-via.c		drivers/i2c/i2c-via.c
-kernel/busses/i2c-viapro.c	driver/i2c/i2c-viapro.c
-kernel/busses/i2c-voodoo3.c	driver/i2c/i2c-voodoo3.c
+kernel/busses/i2c-viapro.c	drivers/i2c/i2c-viapro.c
+kernel/busses/i2c-voodoo3.c	drivers/i2c/i2c-voodoo3.c
 kernel/sensors.c		drivers/sensors/sensors.c
 kernel/chips/adm1021.c		drivers/sensors/adm1021.c
 kernel/chips/adm1025.c		drivers/sensors/adm1025.c
diff --git a/mkpatch/mkpatch.pl b/mkpatch/mkpatch.pl
index c2a4b0e6..68de277f 100755
--- a/mkpatch/mkpatch.pl
+++ b/mkpatch/mkpatch.pl
@@ -977,7 +977,7 @@ sub gen_drivers_i2c_i2c_core_c
 	extern int i2c_via_init(void);
 #endif
 #ifdef CONFIG_I2C_VIAPRO
-	extern int i2c_viapro_init(void);
+	extern int i2c_vt596_init(void);
 #endif
 #ifdef CONFIG_I2C_VOODOO3
 	extern int i2c_voodoo3_init(void);
@@ -1010,7 +1010,7 @@ EOF
 	i2c_via_init();
 #endif
 #ifdef CONFIG_I2C_VIAPRO
-	i2c_viapro_init();
+	i2c_vt596_init();
 #endif
 #ifdef CONFIG_I2C_VOODOO3
 	i2c_voodoo3_init();