diff options
| author | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2011-12-02 14:02:47 -0700 |
|---|---|---|
| committer | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2011-12-02 14:02:47 -0700 |
| commit | a79b1ebce818629037f54c5dcf143cb1195cae5d (patch) | |
| tree | 1051c0fddc57dd04e81b5eb41d279ed8ab00e273 | |
| parent | 9aecf780ad12d638bed9daf6e3c74cb2f8052cea (diff) | |
snowball: android: Fixing interface issue after merge
Function 'rndis_bind_config' ended up with the wrong amount
of parameters after androidizing.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
| -rw-r--r-- | drivers/usb/gadget/f_rndis.c | 5 | ||||
| -rw-r--r-- | drivers/usb/gadget/u_ether.h | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c index 3b9686251c6..c40f540d562 100644 --- a/drivers/usb/gadget/f_rndis.c +++ b/drivers/usb/gadget/f_rndis.c @@ -787,8 +787,7 @@ static inline bool can_support_rndis(struct usb_configuration *c) * for calling @gether_cleanup() before module unload. */ int -rndis_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN], - u32 vendorID, const char *manufacturer) +rndis_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN]) { struct f_rndis *rndis; int status; @@ -833,8 +832,6 @@ rndis_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN], goto fail; memcpy(rndis->ethaddr, ethaddr, ETH_ALEN); - rndis->vendorID = vendorID; - rndis->manufacturer = manufacturer; /* RNDIS activates when the host changes this filter */ rndis->port.cdc_filter = 0; diff --git a/drivers/usb/gadget/u_ether.h b/drivers/usb/gadget/u_ether.h index 5bb1021f6ab..3753ad3a48f 100644 --- a/drivers/usb/gadget/u_ether.h +++ b/drivers/usb/gadget/u_ether.h @@ -112,8 +112,7 @@ int eem_bind_config(struct usb_configuration *c); #ifdef USB_ETH_RNDIS -int rndis_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN], - u32 vendorID, const char *manufacturer); +int rndis_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN]); #else |