Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / rtlwifi / rtl8723ae / sw.c

diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
index 18b0bc51766b64d21e7598be175a293422b064f4..e4c4cdc3eb67f6d992c29b026d98f244400e696b 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
@@ -305,7 +305,7 @@ static struct rtl_hal_cfg rtl8723ae_hal_cfg = {
 
        .maps[RTL_IMR_TXFOVW] = PHIMR_TXFOVW,
        .maps[RTL_IMR_PSTIMEOUT] = PHIMR_PSTIMEOUT,
-       .maps[RTL_IMR_BcnInt] = PHIMR_BCNDMAINT0,
+       .maps[RTL_IMR_BCNINT] = PHIMR_BCNDMAINT0,
        .maps[RTL_IMR_RXFOVW] = PHIMR_RXFOVW,
        .maps[RTL_IMR_RDU] = PHIMR_RDU,
        .maps[RTL_IMR_ATIMEND] = PHIMR_ATIMEND_E,
@@ -341,7 +341,7 @@ static struct rtl_hal_cfg rtl8723ae_hal_cfg = {
        .maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15,
 };
 
-static struct pci_device_id rtl8723ae_pci_ids[] __devinitdata = {
+static struct pci_device_id rtl8723ae_pci_ids[] = {
        {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8723, rtl8723ae_hal_cfg)},
        {},
 };