mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 13:44:26 -04:00
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
This commit is contained in:
commit
332e4af80d
42 changed files with 1142 additions and 758 deletions
|
|
@ -21,6 +21,7 @@
|
|||
#define DM9000_PLATF_32BITONLY (0x0004)
|
||||
#define DM9000_PLATF_EXT_PHY (0x0008)
|
||||
#define DM9000_PLATF_NO_EEPROM (0x0010)
|
||||
#define DM9000_PLATF_SIMPLE_PHY (0x0020) /* Use NSR to find LinkStatus */
|
||||
|
||||
/* platfrom data for platfrom device structure's platfrom_data field */
|
||||
|
||||
|
|
|
|||
|
|
@ -260,7 +260,8 @@ struct rndis_keepalive_c { /* IN (optionally OUT) */
|
|||
|
||||
|
||||
extern void rndis_status(struct usbnet *dev, struct urb *urb);
|
||||
extern int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf);
|
||||
extern int
|
||||
rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf, int buflen);
|
||||
extern int
|
||||
generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags);
|
||||
extern void rndis_unbind(struct usbnet *dev, struct usb_interface *intf);
|
||||
|
|
|
|||
Loading…
Reference in a new issue