diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-01-27 10:59:15 -0500 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-03-09 16:02:45 -0500 |
commit | 748086eb53cc5f467604c9b46ab48dc3cb771c89 (patch) | |
tree | 8ddd1439f766d7bc4b3d3604f369c6326f42625a /drivers/firewire/fw-topology.c | |
parent | 83db801ce8c644edee49f4364c7ebdfef1657762 (diff) |
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>
Diffstat (limited to 'drivers/firewire/fw-topology.c')
-rw-r--r-- | drivers/firewire/fw-topology.c | 5 |
1 files changed, 3 insertions, 2 deletions
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, | |||
342 | int b_path = (node->phy_speed == SCODE_BETA); | 342 | int b_path = (node->phy_speed == SCODE_BETA); |
343 | 343 | ||
344 | if (parent != NULL) { | 344 | if (parent != NULL) { |
345 | node->max_speed = min((u8)parent->max_speed, | 345 | /* min() macro doesn't work here with gcc 3.4 */ |
346 | (u8)node->phy_speed); | 346 | node->max_speed = parent->max_speed < node->phy_speed ? |
347 | parent->max_speed : node->phy_speed; | ||
347 | node->b_path = parent->b_path && b_path; | 348 | node->b_path = parent->b_path && b_path; |
348 | } else { | 349 | } else { |
349 | node->max_speed = node->phy_speed; | 350 | node->max_speed = node->phy_speed; |