diff --git a/[refs] b/[refs] index 5ec20091b07d..5d90a9e5a449 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9be6f10ed3867b1b89c34e4cd3cb5c00c0bc5282 +refs/heads/master: 1897a50c8f86018905449be2b59875bf2fedecb9 diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.h b/trunk/drivers/staging/rtl8192e/rtl_core.h index 2747f0dce632..803cfe870ece 100644 --- a/trunk/drivers/staging/rtl8192e/rtl_core.h +++ b/trunk/drivers/staging/rtl8192e/rtl_core.h @@ -578,7 +578,7 @@ typedef struct r8192_priv struct channel_access_setting ChannelAccessSetting; - mp_adapter NdisAdapter; + struct mp_adapter NdisAdapter; struct rtl819x_ops *ops; struct rtllib_device *rtllib; diff --git a/trunk/drivers/staging/rtl8192e/rtl_pci.h b/trunk/drivers/staging/rtl8192e/rtl_pci.h index 890034aca4e4..b4efc7c4db02 100644 --- a/trunk/drivers/staging/rtl8192e/rtl_pci.h +++ b/trunk/drivers/staging/rtl8192e/rtl_pci.h @@ -54,7 +54,7 @@ static inline void NdisRawReadPortUlong(u32 port, u32 *pval) *pval = inl(port); } -typedef struct _mp_adapter{ +struct mp_adapter { u8 LinkCtrlReg; u8 BusNumber; @@ -69,7 +69,7 @@ typedef struct _mp_adapter{ u16 PciBridgeDeviceId; u8 PciBridgePCIeHdrOffset; u8 PciBridgeLinkCtrlReg; -}mp_adapter,*pmp_adapter; +};//,*pmp_adapter; struct rt_pci_capab_header { unsigned char CapabilityID;