Merge branch 'master' into upstream

[sfrench/cifs-2.6.git] / drivers / net / wan / hdlc_cisco.c

diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c
index 7ec2b2f9b7eec6750c7906ff7f281b23bb530fe5..b0bc5ddcf1b11df483912a33160ce074c75ffa5c 100644 (file)
--- a/drivers/net/wan/hdlc_cisco.c
+++ b/drivers/net/wan/hdlc_cisco.c
@@ -161,7 +161,7 @@ static int cisco_rx(struct sk_buff *skb)
        struct hdlc_header *data = (struct hdlc_header*)skb->data;
        struct cisco_packet *cisco_data;
        struct in_device *in_dev;
-       u32 addr, mask;
+       __be32 addr, mask;
 
        if (skb->len < sizeof(struct hdlc_header))
                goto rx_error;