diff options
| author |   James Morris <james.morris@microsoft.com> | 2018-09-04 11:35:54 -0700 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-09-04 11:35:54 -0700 |
| commit | e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce (patch) | |
| tree | f956a5ea0e83fc6d0df3e64681e7bbc1f201f3ee /drivers/staging/rtlwifi/halmac/halmac_api.h | |
| parent | security/capabilities: remove check for -EINVAL (diff) | |
| parent | Linux 4.19-rc2 (diff) | |
| download | linux-dev-e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce.tar.xz linux-dev-e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce.zip | |
Merge tag 'v4.19-rc2' into next-general
Sync to Linux 4.19-rc2 for downstream developers.
Diffstat (limited to '')
| -rw-r--r-- | drivers/staging/rtlwifi/halmac/halmac_api.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/rtlwifi/halmac/halmac_api.h b/drivers/staging/rtlwifi/halmac/halmac_api.h index 4922cc8ce6f2..e220db39c8a7 100644 --- a/drivers/staging/rtlwifi/halmac/halmac_api.h +++ b/drivers/staging/rtlwifi/halmac/halmac_api.h @@ -29,7 +29,6 @@ #include "halmac_usb_reg.h" #include "halmac_sdio_reg.h" -#include "halmac_pcie_reg.h" #include "halmac_bit2.h" #include "halmac_reg2.h" |