diff --git a/[refs] b/[refs] index 6acaf85e11b5..4a7561b72fd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf58bd66f6212d838dda4384b8cd21337b47e363 +refs/heads/master: 785698e38dcd01cd15dacbf0cf1309a04b1e3208 diff --git a/trunk/drivers/staging/bcm/Adapter.h b/trunk/drivers/staging/bcm/Adapter.h index 742ddeb798d0..748460e898d8 100644 --- a/trunk/drivers/staging/bcm/Adapter.h +++ b/trunk/drivers/staging/bcm/Adapter.h @@ -484,8 +484,8 @@ struct _MINI_ADAPTER BOOLEAN AutoSyncup; struct net_device *dev; - UINT major; - UINT minor; + int major; + int minor; wait_queue_head_t tx_packet_wait_queue; wait_queue_head_t process_rx_cntrlpkt; atomic_t process_waiting;