Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=748086eb53cc5f467604c9b46ab48dc3cb771c89
Commit:     748086eb53cc5f467604c9b46ab48dc3cb771c89
Parent:     83db801ce8c644edee49f4364c7ebdfef1657762
Author:     Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Sat Jan 27 16:59:15 2007 +0100
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Fri Mar 9 22:02:45 2007 +0100

    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 <[EMAIL PROTECTED]>
---
 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 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to