diff --git a/[refs] b/[refs] index 5556a83c764a..de890deffa9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d5693b2211b7d7639fce4d2edcb3c410e499554 +refs/heads/master: a3e9909916abfdfe8863d8d67ab1ef49e3ded53c diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_HT.h b/trunk/drivers/staging/rtl8192e/rtl819x_HT.h index 113ee98540a4..eeee72ac1f57 100644 --- a/trunk/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/trunk/drivers/staging/rtl8192e/rtl819x_HT.h @@ -102,7 +102,7 @@ union ht_capability { }Field; }; -typedef union _HT_CAPABILITY_MACPARA{ +union ht_capability_macpara { u8 ShortData; u8 CharData[1]; struct @@ -111,7 +111,7 @@ typedef union _HT_CAPABILITY_MACPARA{ u8 MPDUDensity:2; u8 Rsvd:4; }Field; -}HT_CAPABILITY_MACPARA, *PHT_CAPABILITY_MACPARA; +}; */ typedef enum _HT_ACTION{