diff --git a/mkpatch/mkpatch.pl b/mkpatch/mkpatch.pl
index a9a78753..ff9e176c 100755
--- a/mkpatch/mkpatch.pl
+++ b/mkpatch/mkpatch.pl
@@ -865,14 +865,10 @@ sub gen_drivers_sensors_Makefile
   my ($package_root,$kernel_root) = @_;
   my $kernel_file = "drivers/sensors/Makefile";
   my $package_file = $temp;
-  my $use_new_format;
-  `grep -q -s 'i2c\.o' "$kernel_root/drivers/i2c/Makefile"`;
-  $use_new_format = ! $?;
 
   open OUTPUT,">$package_root/$package_file"
         or die "Can't open $package_root/$package_file";
-  if ($use_new_format) {
-    print OUTPUT <<'EOF';
+  print OUTPUT <<'EOF';
 #
 # Makefile for the kernel hardware sensors drivers.
 #
@@ -920,286 +916,6 @@ obj-$(CONFIG_SENSORS_W83L785TS)	+= w83l785ts.o
 include $(TOPDIR)/Rules.make
 
 EOF
-  } else {
-    print OUTPUT <<'EOF';
-#
-# Makefile for the kernel hardware sensors drivers.
-#
-
-SUB_DIRS     :=
-MOD_SUB_DIRS := $(SUB_DIRS)
-ALL_SUB_DIRS := $(SUB_DIRS)
-MOD_LIST_NAME := SENSORS_MODULES
-
-L_TARGET := sensors.a
-MX_OBJS :=  
-M_OBJS  := 
-LX_OBJS :=
-L_OBJS  := 
-
-# -----
-# i2c core components
-# -----
-
-ifeq ($(CONFIG_SENSORS),y)
-  LX_OBJS += sensors.o
-else
-  ifeq ($(CONFIG_SENSORS),m)
-    MX_OBJS += sensors.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_ADM1021),y)
-  L_OBJS += adm1021.o
-else
-  ifeq ($(CONFIG_SENSORS_ADM1021),m)
-    M_OBJS += adm1021.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_ADM1024),y)
-  L_OBJS += adm1024.o
-else
-  ifeq ($(CONFIG_SENSORS_ADM1024),m)
-    M_OBJS += adm1024.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_ADM1025),y)
-  L_OBJS += adm1025.o
-else
-  ifeq ($(CONFIG_SENSORS_ADM1025),m)
-    M_OBJS += adm1025.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_ADM1026),y)
-  L_OBJS += adm1026.o
-else
-  ifeq ($(CONFIG_SENSORS_ADM1026),m)
-    M_OBJS += adm1026.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_ADM9240),y)
-  L_OBJS += adm9240.o
-else
-  ifeq ($(CONFIG_SENSORS_ADM9240),m)
-    M_OBJS += adm9240.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_DDCMON),y)
-  L_OBJS += ddcmon.o
-else
-  ifeq ($(CONFIG_SENSORS_DDCMON),m)
-    M_OBJS += ddcmon.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_DS1621),y)
-  L_OBJS += ds1621.o
-else
-  ifeq ($(CONFIG_SENSORS_DS1621),m)
-    M_OBJS += ds1621.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_EEPROM),y)
-  L_OBJS += eeprom.o
-else
-  ifeq ($(CONFIG_SENSORS_EEPROM),m)
-    M_OBJS += eeprom.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_FSCPOS),y)
-  L_OBJS += fscpos.o
-else
-  ifeq ($(CONFIG_SENSORS_FSCPOS),m)
-    M_OBJS += fscpos.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_FSCSCY),y)
-  L_OBJS += fscscy.o
-else
-  ifeq ($(CONFIG_SENSORS_FSCSCY),m)
-    M_OBJS += fscscy.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_GL518SM),y)
-  L_OBJS += gl518sm.o
-else
-  ifeq ($(CONFIG_SENSORS_GL518SM),m)
-    M_OBJS += gl518sm.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_GL520SM),y)
-  L_OBJS += gl520sm.o
-else
-  ifeq ($(CONFIG_SENSORS_GL520SM),m)
-    M_OBJS += gl520sm.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_IT87),y)
-  L_OBJS += it87.o
-else
-  ifeq ($(CONFIG_SENSORS_IT87),m)
-    M_OBJS += it87.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_LM75),y)
-  L_OBJS += lm75.o
-else
-  ifeq ($(CONFIG_SENSORS_LM75),m)
-    M_OBJS += lm75.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_LM78),y)
-  L_OBJS += lm78.o
-else
-  ifeq ($(CONFIG_SENSORS_LM78),m)
-    M_OBJS += lm78.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_LM80),y)
-  L_OBJS += lm80.o
-else
-  ifeq ($(CONFIG_SENSORS_LM80),m)
-    M_OBJS += lm80.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_LM85),y)
-  L_OBJS += lm85.o
-else
-  ifeq ($(CONFIG_SENSORS_LM85),m)
-    M_OBJS += lm85.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_LM87),y)
-  L_OBJS += lm87.o
-else
-  ifeq ($(CONFIG_SENSORS_LM87),m)
-    M_OBJS += lm87.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_LM92),y)
-  L_OBJS += lm92.o
-else
-  ifeq ($(CONFIG_SENSORS_LM92),m)
-    M_OBJS += lm92.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_MATORB),y)
-  L_OBJS += matorb.o
-else
-  ifeq ($(CONFIG_SENSORS_MATORB),m)
-    M_OBJS += matorb.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_MAXILIFE),y)
-  L_OBJS += maxilife.o
-else
-  ifeq ($(CONFIG_SENSORS_MAXILIFE),m)
-    M_OBJS += maxilife.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_MTP008),y)
-  L_OBJS += mtp008.o
-else
-  ifeq ($(CONFIG_SENSORS_MTP008),m)
-    M_OBJS += mtp008.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_PCF8574),y)
-  L_OBJS += pcf8574.o
-else
-  ifeq ($(CONFIG_SENSORS_PCF8574),m)
-    M_OBJS += pcf8574.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_PCF8591),y)
-  L_OBJS += pcf8591.o
-else
-  ifeq ($(CONFIG_SENSORS_PCF8591),m)
-    M_OBJS += pcf8591.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_SIS5595),y)
-  L_OBJS += sis5595.o
-else
-  ifeq ($(CONFIG_SENSORS_SIS5595),m)
-    M_OBJS += sis5595.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_SMSC47M1),y)
-  L_OBJS += smsc47m1.o
-else
-  ifeq ($(CONFIG_SENSORS_SMSC47M1),m)
-    M_OBJS += smsc47m1.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_THMC50),y)
-  L_OBJS += thmc50.o
-else
-  ifeq ($(CONFIG_SENSORS_THMC50),m)
-    M_OBJS += thmc50.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_VIA686A),y)
-  L_OBJS += via686a.o
-else
-  ifeq ($(CONFIG_SENSORS_VIA686A),m)
-    M_OBJS += via686a.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_VT1211),y)
-  L_OBJS += vt1211.o
-else
-  ifeq ($(CONFIG_SENSORS_VT1211),m)
-    M_OBJS += vt1211.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_VT8211),y)
-  L_OBJS += vt8231.o
-else
-  ifeq ($(CONFIG_SENSORS_VT8231),m)
-    M_OBJS += vt8231.o
-  endif
-endif
-
-ifeq ($(CONFIG_SENSORS_W83781D),y)
-  L_OBJS += w83781d.o
-else
-  ifeq ($(CONFIG_SENSORS_W83781D),m)
-    M_OBJS += w83781d.o
-  endif
-endif
-
-include $(TOPDIR)/Rules.make
-EOF
-  }  
   close OUTPUT;
   print_diff $package_root,$kernel_root,$kernel_file,$package_file;
 }
@@ -1216,22 +932,19 @@ sub gen_drivers_i2c_Makefile
   my $kernel_file = "drivers/i2c/Makefile";
   my $package_file = $temp;
   my $pr1 = 0;
-  my $new_format = 0;
 
   open INPUT,"$kernel_root/$kernel_file"
         or die "Can't open `$kernel_root/$kernel_file'";
   open OUTPUT,">$package_root/$package_file"
         or die "Can't open $package_root/$package_file";
   while(<INPUT>) {
-    $new_format = 1 if m@i2c\.o@;
     if (m@sensors code starts here@) {
       $pr1 ++;
       print OUTPUT;
       while (<INPUT>) {
         last if m@sensors code ends here@;
       }
-      if ($new_format) {
-        print OUTPUT << 'EOF';
+      print OUTPUT <<'EOF';
 obj-$(CONFIG_I2C_ALI1535)		+= i2c-ali1535.o
 obj-$(CONFIG_I2C_ALI15X3)		+= i2c-ali15x3.o
 obj-$(CONFIG_I2C_AMD756)		+= i2c-amd756.o
@@ -1251,146 +964,6 @@ obj-$(CONFIG_I2C_VIAPRO)		+= i2c-viapro.o
 obj-$(CONFIG_I2C_VOODOO3)		+= i2c-voodoo3.o
 export-objs				+= dmi_scan.o
 EOF
-      } else {
-        print OUTPUT << 'EOF';
-ifeq ($(CONFIG_I2C_ALI1535),y)
-  L_OBJS += i2c-ali1535.o
-else 
-  ifeq ($(CONFIG_I2C_ALI1535),m)
-    M_OBJS += i2c-ali1535.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_ALI15X3),y)
-  L_OBJS += i2c-ali15x3.o
-else 
-  ifeq ($(CONFIG_I2C_ALI15X3),m)
-    M_OBJS += i2c-ali15x3.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_AMD756),y)
-  L_OBJS += i2c-amd756.o
-else 
-  ifeq ($(CONFIG_I2C_AMD756),m)
-    M_OBJS += i2c-amd756.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_AMD8111),y)
-  L_OBJS += i2c-amd8111.o
-else 
-  ifeq ($(CONFIG_I2C_AMD8111),m)
-    M_OBJS += i2c-amd8111.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_HYDRA),y)
-  L_OBJS += i2c-hydra.o
-else 
-  ifeq ($(CONFIG_I2C_HYDRA),m)
-    M_OBJS += i2c-hydra.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_I801),y)
-  L_OBJS += i2c-i801.o
-else 
-  ifeq ($(CONFIG_I2C_I801),m)
-    M_OBJS += i2c-i801.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_I810),y)
-  L_OBJS += i2c-i810.o
-else 
-  ifeq ($(CONFIG_I2C_I810),m)
-    M_OBJS += i2c-i810.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_ISA),y)
-  L_OBJS += i2c-isa.o
-else 
-  ifeq ($(CONFIG_I2C_ISA),m)
-    M_OBJS += i2c-isa.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_PIIX4),y)
-  L_OBJS += i2c-piix4.o dmi_scan.o
-else 
-  ifeq ($(CONFIG_I2C_PIIX4),m)
-    M_OBJS += i2c-piix4.o dmi_scan.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_SIS5595),y)
-  L_OBJS += i2c-sis5595.o
-else 
-  ifeq ($(CONFIG_I2C_SIS5595),m)
-    M_OBJS += i2c-sis5595.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_SIS630),y)
-  L_OBJS += i2c-sis630.o
-else 
-  ifeq ($(CONFIG_I2C_SIS630),m)
-    M_OBJS += i2c-sis630.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_SIS645),y)
-  L_OBJS += i2c-sis645.o
-else 
-  ifeq ($(CONFIG_I2C_SIS645),m)
-    M_OBJS += i2c-sis645.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_SAVAGE4),y)
-  L_OBJS += i2c-savage4.o
-else 
-  ifeq ($(CONFIG_I2C_SAVAGE4),m)
-    M_OBJS += i2c-SAVAGE4.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_TSUNAMI),y)
-  L_OBJS += i2c-tsunami.o
-else 
-  ifeq ($(CONFIG_I2C_TSUNAMI),m)
-    M_OBJS += i2c-tsunami.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_VIA),y)
-  L_OBJS += i2c-via.o
-else 
-  ifeq ($(CONFIG_I2C_VIA),m)
-    M_OBJS += i2c-via.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_VIAPRO),y)
-  L_OBJS += i2c-viapro.o
-else 
-  ifeq ($(CONFIG_I2C_VIAPRO),m)
-    M_OBJS += i2c-viapro.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2C_VOODOO3),y)
-  L_OBJS += i2c-voodoo3.o
-else 
-  ifeq ($(CONFIG_I2C_VOODOO3),m)
-    M_OBJS += i2c-voodoo3.o
-  endif
-endif
-
-EOF
-      }
     }
     print OUTPUT;
   }