diff --git a/[refs] b/[refs] index 9054b96f8222..29f007cabb9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0024a1e73404b06a302f39eb3ceb15d9d741c552 +refs/heads/master: fc6556e8442dfe275becf7e7349c5e8916d2a1cc diff --git a/trunk/drivers/staging/rtl8712/usb_ops_linux.c b/trunk/drivers/staging/rtl8712/usb_ops_linux.c index 9e28ef0e46d5..dca398a0656b 100644 --- a/trunk/drivers/staging/rtl8712/usb_ops_linux.c +++ b/trunk/drivers/staging/rtl8712/usb_ops_linux.c @@ -45,9 +45,6 @@ struct zero_bulkout_context { void *padapter; }; -#define usb_write_cmd r8712_usb_write_mem -#define usb_write_cmd_complete usb_write_mem_complete - uint r8712_usb_init_intf_priv(struct intf_priv *pintfpriv) { pintfpriv->piorw_urb = usb_alloc_urb(0, GFP_ATOMIC);