diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 7a72a31..781908f 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2629,6 +2629,16 @@ static int __devinit happy_meal_sbus_pro
        int i, qfe_slot = -1;
        int err = -ENODEV;

+       /* if SBus and PCI are both enabled, the current implementation
+        * will cause the SBus probe to run on PCI devices.  This should
+        * be fixed in the OF routines, unless this "collision" is
+        * particular to HME, but for now we'll check for an idiomatic
+        * PCI-only property and exit if found.
+        */
+       if (of_find_property(dp, "device-id", NULL)) {
+               return err;
+       }
+
        if (is_qfe) {
                qp = quattro_sbus_find(op);
                if (qp == NULL)