diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2019-09-16 09:51:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2019-09-16 09:51:32 +0200 |
| commit | 83f541302cae9c20bf3d64dfca4e093e61bb2aa4 (patch) | |
| tree | 1be66d6c895531060eb07308415588d999a602c8 /arch/x86/boot/compressed/misc.h | |
| parent | 72c5343cdbc5ec257e45d5387ed7220065c2ecff (diff) | |
| parent | e19c5132f78a70cc53745558c0e728fecc74030a (diff) | |
Merge 4.4.193 into android-4.4-p
Changes in 4.4.193
ALSA: hda - Fix potential endless loop at applying quirks
ALSA: hda/realtek - Fix overridden device-specific initialization
xfrm: clean up xfrm protocol checks
vhost/test: fix build for vhost test
scripts/decode_stacktrace: match basepath using shell prefix operator, not regex
clk: s2mps11: Add used attribute to s2mps11_dt_match
x86, boot: Remove multiple copy of static function sanitize_boot_params()
af_packet: tone down the Tx-ring unsupported spew.
vhost: make sure log_num < in_num
Linux 4.4.193
Change-Id: If2283bf8bc29f3deaf1c047c8ec9e502fbdf0521
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'arch/x86/boot/compressed/misc.h')
| -rw-r--r-- | arch/x86/boot/compressed/misc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index 8fcbe6c4d7d9..bce182708814 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -19,8 +19,6 @@ #include <asm/page.h> #include <asm/boot.h> #include <asm/bootparam.h> -#include "../string.h" -#include <asm/bootparam_utils.h> #define BOOT_BOOT_H #include "../ctype.h" |