diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 09:37:56 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 09:37:56 -0500 |
| commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db (patch) | |
| tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd /drivers/s390/net/lcs.c | |
| parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (diff) | |
| parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c
Fix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
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) |