diff --git a/[refs] b/[refs] index 45b0c6d5b63e..d195a615bd05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85b331afb29a25fe770750c7dc169688a1c7f9ec +refs/heads/master: 38d6d8de76bdde708ee5bc7d2087f9968a0c5ddd diff --git a/trunk/drivers/staging/bcm/InterfaceAdapter.h b/trunk/drivers/staging/bcm/InterfaceAdapter.h index f6e26007db79..06a6b18bca48 100644 --- a/trunk/drivers/staging/bcm/InterfaceAdapter.h +++ b/trunk/drivers/staging/bcm/InterfaceAdapter.h @@ -60,7 +60,7 @@ struct bcm_interface_adapter { struct bcm_intr_endpoint_in sIntrIn; /* Interrupt endpoint out info */ struct bcm_intr_endpoint_out sIntrOut; - ULONG ulInterruptData[2]; + unsigned long ulInterruptData[2]; struct urb *psInterruptUrb; struct bcm_usb_tcb asUsbTcb[MAXIMUM_USB_TCB]; struct bcm_usb_rcb asUsbRcb[MAXIMUM_USB_RCB];