From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sat, 27 Jan 2007 15:59:15 +0000 (+0100)
Subject: firewire: fix compilation with gcc 3.4
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=748086eb53cc5f467604c9b46ab48dc3cb771c89;p=deliverable%2Flinux.git

firewire: fix compilation with gcc 3.4

drivers/firewire/fw-topology.c: In function `report_found_node':
drivers/firewire/fw-topology.c:345: error: `typeof' applied to a bit-field
drivers/firewire/fw-topology.c:345: error: `typeof' applied to a bit-field

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---

diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index d3131e7d52fa..fc8f1e7d3b07 100644
--- a/drivers/firewire/fw-topology.c
+++ b/drivers/firewire/fw-topology.c
@@ -342,8 +342,9 @@ report_found_node(struct fw_card *card,
 	int b_path = (node->phy_speed == SCODE_BETA);
 
 	if (parent != NULL) {
-		node->max_speed = min((u8)parent->max_speed,
-				      (u8)node->phy_speed);
+		/* min() macro doesn't work here with gcc 3.4 */
+		node->max_speed = parent->max_speed < node->phy_speed ?
+					parent->max_speed : node->phy_speed;
 		node->b_path = parent->b_path && b_path;
 	} else {
 		node->max_speed = node->phy_speed;