diff options
author | 2019-11-29 20:34:28 +0100 | |
---|---|---|
committer | 2019-11-29 20:34:28 +0100 | |
commit | b746a1a2860f4a918f32d10dc569115d282aaf2f (patch) | |
tree | 4b30e6ff28e2783c73a1b763e819f5b41414563c /drivers/net/wireless/intel/iwlegacy/3945-mac.c | |
parent | HID: rmi: Check that the RMI_STARTED bit is set before unregistering the RMI transport device (diff) | |
parent | HID: quirks: remove hid-led devices from hid_have_special_driver (diff) | |
download | linux-dev-b746a1a2860f4a918f32d10dc569115d282aaf2f.tar.xz linux-dev-b746a1a2860f4a918f32d10dc569115d282aaf2f.zip |
Merge branch 'for-5.5/core' into for-linus
- hid_have_special_driver[] cleanup for LED devices (Heiner Kallweit)
- HID parser improvements (Blaž Hrastnik, Candle Sun)
Diffstat (limited to 'drivers/net/wireless/intel/iwlegacy/3945-mac.c')
-rw-r--r-- | drivers/net/wireless/intel/iwlegacy/3945-mac.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless/intel/iwlegacy/3945-mac.c index b82da75a9ae3..4fbcc7fba3cc 100644 --- a/drivers/net/wireless/intel/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/intel/iwlegacy/3945-mac.c @@ -18,7 +18,6 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/pci.h> -#include <linux/pci-aspm.h> #include <linux/slab.h> #include <linux/dma-mapping.h> #include <linux/delay.h> |