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 d3131e7..fc8f1e7 100644 (file)
--- 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;