---

yaml --- r: 368347 b: refs/heads/master c: 10419d0 h: refs/heads/master i: 368345: 845b467 368343: 2a09e2d v: v3
git-mirror · Mar 6, 2013 · 85d7bda · 85d7bda
1 parent b6eef87
commit 85d7bda
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a703ab5fba5b00292c1e7e964783c304f43fef7
+refs/heads/master: 10419d08b96e58e140ca44293ee941973396adee
diff --git a/trunk/drivers/bcma/main.c b/trunk/drivers/bcma/main.c
@@ -120,6 +120,11 @@ static int bcma_register_cores(struct bcma_bus *bus)
 			continue;
 		}
 
+		/* Only first GMAC core on BCM4706 is connected and working */
+		if (core->id.id == BCMA_CORE_4706_MAC_GBIT &&
+		    core->core_unit > 0)
+			continue;
+
 		core->dev.release = bcma_release_core_dev;
 		core->dev.bus = &bcma_bus_type;
 		dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);