diff --git a/[refs] b/[refs] index 0a682b1c85ea..e47dac46bcbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67b587cd94a9cb16ad65eba80da36757f5486e58 +refs/heads/master: 3ee5afde0e66823201346cdf6e0eb2f6ed1f5af1 diff --git a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h index e966f7efce28..a21804001def 100644 --- a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h +++ b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h @@ -79,7 +79,7 @@ typedef enum _E_IPADDR_CONTEXT { /* Function Prototypes */ unsigned short IpVersion6(struct bcm_mini_adapter *Adapter, /* < Pointer to the driver control structure */ - PVOID pcIpHeader, /*