diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index c862a86c..bf7cc669 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -372,7 +372,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0519,
        func   => 0,
        procid => "MGA 2064W [Millennium]",
-       driver => "i2c-matroxfb",
+       driver => "<DISABLED>", # "i2c-matroxfb",
        match  => sub { $_[0] =~ /^DDC:fb[0-9]{1,2}/ },
      },
      {
@@ -380,7 +380,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x051a,
        func   => 0,
        procid => "MGA 1064SG [Mystique]",
-       driver => "i2c-matroxfb",
+       driver => "<DISABLED>", # "i2c-matroxfb",
        match  => sub { $_[0] =~ /^DDC:fb[0-9]{1,2}/ },
      },
      {
@@ -388,7 +388,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x051b,
        func   => 0,
        procid => "MGA 2164W [Millennium II]",
-       driver => "i2c-matroxfb",
+       driver => "<DISABLED>", # "i2c-matroxfb",
        match  => sub { $_[0] =~ /^DDC:fb[0-9]{1,2}/ },
      },
      {
@@ -396,7 +396,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x051e,
        func   => 0,
        procid => "MGA 1064SG [Mystique] AGP",
-       driver => "i2c-matroxfb",
+       driver => "<DISABLED>", # "i2c-matroxfb",
        match  => sub { $_[0] =~ /^DDC:fb[0-9]{1,2}/ },
      },
      {
@@ -404,7 +404,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x051f,
        func   => 0,
        procid => "MGA 2164W [Millennium II] AGP",
-       driver => "i2c-matroxfb",
+       driver => "<DISABLED>", # "i2c-matroxfb",
        match  => sub { $_[0] =~ /^DDC:fb[0-9]{1,2}/ },
      },
      {
@@ -412,7 +412,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x1000,
        func   => 0,
        procid => "MGA G100 [Productiva]",
-       driver => "i2c-matroxfb",
+       driver => "<DISABLED>", # "i2c-matroxfb",
        match  => sub { $_[0] =~ /^DDC:fb[0-9]{1,2}/ },
      },
      {
@@ -420,7 +420,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x1001,
        func   => 0,
        procid => "MGA G100 [Productiva] AGP",
-       driver => "i2c-matroxfb",
+       driver => "<DISABLED>", # "i2c-matroxfb",
        match  => sub { $_[0] =~ /^DDC:fb[0-9]{1,2}/ },
      },
      {
@@ -428,7 +428,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0520,
        func   => 0,
        procid => "MGA G200",
-       driver => "i2c-matroxfb",
+       driver => "<DISABLED>", # "i2c-matroxfb",
        match  => sub { $_[0] =~ /^DDC:fb[0-9]{1,2}/ },
      },
      {
@@ -436,7 +436,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0521,
        func   => 0,
        procid => "MGA G200 AGP",
-       driver => "i2c-matroxfb",
+       driver => "<DISABLED>", # "i2c-matroxfb",
        match  => sub { $_[0] =~ /^DDC:fb[0-9]{1,2}/ },
      },
      {
@@ -444,7 +444,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0525,
        func   => 0,
        procid => "MGA G400 AGP",
-       driver => "i2c-matroxfb",
+       driver => "<DISABLED>", # "i2c-matroxfb",
        match  => sub { $_[0] =~ /^(DDC,MAVEN):fb[0-9]{1,2}/ },
      },
      {
@@ -500,7 +500,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0018,
        func => 0,
        procid => "RIVA 128",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -508,7 +508,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0020,
        func => 0,
        procid => "RIVA TNT",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -516,7 +516,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0028,
        func => 0,
        procid => "RIVA TNT2",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -524,7 +524,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0029,
        func => 0,
        procid => "RIVA UTNT2",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -532,7 +532,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x002c,
        func => 0,
        procid => "RIVA VTNT2",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -540,7 +540,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x002d,
        func => 0,
        procid => "RIVA UVTNT2",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -548,7 +548,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x00a0,
        func => 0,
        procid => "RIVA ITNT2",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -556,7 +556,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0100,
        func => 0,
        procid => "GeForce SDR",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -564,7 +564,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0101,
        func => 0,
        procid => "GeForce DDR",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -572,7 +572,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0102,
        func => 0,
        procid => "Quadro",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -580,7 +580,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0150,
        func => 0,
        procid => "GeForce2 GTS",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -588,7 +588,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0110,
        func => 0,
        procid => "GeForce2 MX",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -596,7 +596,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0111,
        func => 0,
        procid => "GeForce2 MX2",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -604,7 +604,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0113,
        func => 0,
        procid => "Quadro2 MXR",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -612,7 +612,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0151,
        func => 0,
        procid => "GeForce2 GTS2",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -620,7 +620,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0152,
        func => 0,
        procid => "GeForce2 Ultra",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -628,7 +628,7 @@ use vars qw(@pci_adapters @chip_ids @superio_ids @undetectable_adapters @dmideco
        devid  => 0x0153,
        func => 0,
        procid => "Quadro2 Pro",
-       driver => "i2c-riva",
+       driver => "<DISABLED>", # "i2c-riva",
        match => sub { $_[0] =~ /^NVIDIA display/ },
      } , 
      { 
@@ -3529,6 +3529,7 @@ sub main
   } else {
     print " We will now try to load each adapter module in turn.\n";
     foreach $adapter (@adapters) {
+      next if $adapter eq "<DISABLED>";
       if (contains $adapter, @modules_list) {
         print "Module `$adapter' already loaded.\n";
       } else {