Index: /lm-sensors/trunk/prog/detect/sensors-detect
===================================================================
--- /lm-sensors/trunk/prog/detect/sensors-detect	(revision 4055)
+++ /lm-sensors/trunk/prog/detect/sensors-detect	(revision 4062)
@@ -869,4 +869,32 @@
        match => qr/^SMBus PIIX4 adapter at /,
      } , 
+     {
+       vendid => 0x100B,
+       devid => 0x0500,
+       procid => "SCx200 Bridge",
+       driver => "scx200_acb",
+       match => qr/^(NatSemi SCx200 ACCESS\.bus|SCx200 ACB\d+) /,
+     },
+     {
+       vendid => 0x100B,
+       devid => 0x0510,
+       procid => "SC1100 Bridge",
+       driver => "scx200_acb",
+       match => qr/^(NatSemi SCx200 ACCESS\.bus|SCx200 ACB\d+) /,
+     },
+     {
+       vendid => 0x100B,
+       devid => 0x002B,
+       procid => "CS5535 ISA bridge",
+       driver => "scx200_acb",
+       match => qr/^CS5535 ACB\d+ /,
+     },
+     {
+       vendid => 0x1022,
+       devid => 0x2090,
+       procid => "CS5536 [Geode companion] ISA",
+       driver => "scx200_acb",
+       match => qr/^CS553[56] ACB\d+ /,
+     },
 );
 
@@ -2323,5 +2351,5 @@
       if ($try->{vendid} == $device->{vendid} &&
           $try->{devid} == $device->{devid} &&
-          $try->{func} == $device->{func}) {
+          (!defined($try->{func}) || $try->{func} == $device->{func})) {
         printf "Use driver `%s' for device %02x:%02x.%x: %s\n",
                $try->{driver},
Index: /lm-sensors/trunk/CHANGES
===================================================================
--- /lm-sensors/trunk/CHANGES	(revision 4061)
+++ /lm-sensors/trunk/CHANGES	(revision 4062)
@@ -51,4 +51,5 @@
                           Handle the W83791D driver difference between kernels
                           Add nForce4 MCP04, MCP51 and MCP55 detection
+                          Add AMD Geode devices detection