diff options
author | 2018-11-06 13:57:02 +0100 | |
---|---|---|
committer | 2018-11-06 13:57:02 +0100 | |
commit | 0c7244209588630a9b45e52490ef1390e04499a6 (patch) | |
tree | d60f5610f9b36ff05ed5202396c811628bacdb61 /drivers/misc/mei/bus-fixup.c | |
parent | HID: i2c-hid: add Direkt-Tek DTLAPY133-1 to descriptor override (diff) | |
parent | Merge tag 'platform-drivers-x86-v4.20-1' of git://git.infradead.org/linux-platform-drivers-x86 (diff) | |
download | linux-dev-0c7244209588630a9b45e52490ef1390e04499a6.tar.xz linux-dev-0c7244209588630a9b45e52490ef1390e04499a6.zip |
Merge branch 'master' into for-4.20/upstream-fixes
Pull in a merge commit that brought in 3b692c55e58d ("HID: asus: only
support backlight when it's not driven by WMI") so that fixup could be
applied on top of it.
Diffstat (limited to 'drivers/misc/mei/bus-fixup.c')
-rw-r--r-- | drivers/misc/mei/bus-fixup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c index a6f41f96f2a1..80215c312f0e 100644 --- a/drivers/misc/mei/bus-fixup.c +++ b/drivers/misc/mei/bus-fixup.c @@ -17,7 +17,6 @@ #include <linux/kernel.h> #include <linux/sched.h> #include <linux/module.h> -#include <linux/moduleparam.h> #include <linux/device.h> #include <linux/slab.h> #include <linux/uuid.h> |