diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /drivers/s390/net/lcs.c | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'drivers/s390/net/lcs.c')
| -rw-r--r-- | drivers/s390/net/lcs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index 16ac68c27a27..66a8aec6efa6 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c | |||
| @@ -1147,7 +1147,7 @@ list_modified: | |||
| 1147 | * get mac address for the relevant Multicast address | 1147 | * get mac address for the relevant Multicast address |
| 1148 | */ | 1148 | */ |
| 1149 | static void | 1149 | static void |
| 1150 | lcs_get_mac_for_ipm(__u32 ipm, char *mac, struct net_device *dev) | 1150 | lcs_get_mac_for_ipm(__be32 ipm, char *mac, struct net_device *dev) |
| 1151 | { | 1151 | { |
| 1152 | LCS_DBF_TEXT(4,trace, "getmac"); | 1152 | LCS_DBF_TEXT(4,trace, "getmac"); |
| 1153 | if (dev->type == ARPHRD_IEEE802_TR) | 1153 | if (dev->type == ARPHRD_IEEE802_TR) |