summaryrefslogtreecommitdiffstats
path: root/drivers/firewire/fw-topology.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2007-01-27 16:59:15 +0100
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-03-09 22:02:45 +0100
commit748086eb53cc5f467604c9b46ab48dc3cb771c89 (patch)
tree8ddd1439f766d7bc4b3d3604f369c6326f42625a /drivers/firewire/fw-topology.c
parent83db801ce8c644edee49f4364c7ebdfef1657762 (diff)
downloadop-kernel-dev-748086eb53cc5f467604c9b46ab48dc3cb771c89.zip
op-kernel-dev-748086eb53cc5f467604c9b46ab48dc3cb771c89.tar.gz
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.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index d3131e7..fc8f1e7 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;
OpenPOWER on IntegriCloud