--- a/master/master.c	Fri Feb 24 13:34:31 2006 +0000
+++ b/master/master.c	Fri Feb 24 13:54:27 2006 +0000
@@ -335,8 +335,7 @@
             slave = master->slaves + i;
             if (!slave->type) continue;
 
-            if (strcmp(slave->type->vendor_name, "Beckhoff") == 0 &&
-                strcmp(slave->type->product_name, "EK1100") == 0) {
+            if (slave->type->bus_coupler) {
                 coupler_idx++;
                 slave_idx = 0;
             }
@@ -543,7 +542,7 @@
 
         // Slaves that are not registered are only brought into PREOP
         // state -> nice blinking and mailbox comm. possible
-        if (!slave->registered) {
+        if (!slave->registered && !slave->type->bus_coupler) {
             printk(KERN_WARNING "EtherCAT: Slave %i was not registered!\n",
                    slave->ring_position);
             continue;