Merge branch 'upstream-next-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

This commit is contained in:
David S. Miller
2008-05-29 03:31:03 -07:00
25 changed files with 1216 additions and 470 deletions

View File

@@ -283,8 +283,8 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
struct rndis_set_c *set_c;
struct rndis_halt *halt;
} u;
u32 tmp, phym_unspec;
__le32 *phym;
u32 tmp;
__le32 phym_unspec, *phym;
int reply_len;
unsigned char *bp;