diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2017-03-17 20:34:30 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-03-17 20:34:30 +0100 |
commit | 79a21d572cf66968a2272fdf9711f835518256d9 (patch) | |
tree | 5fe3e4692fb8375faf8e1aeea1c2eae38c342250 /drivers/media/pci/ivtv/ivtv-driver.c | |
parent | efi/arm: Fix boot crash with CONFIG_CPUMASK_OFFSTACK=y (diff) | |
parent | efi/esrt: Cleanup bad memory map log messages (diff) | |
download | linux-79a21d572cf66968a2272fdf9711f835518256d9.tar.xz linux-79a21d572cf66968a2272fdf9711f835518256d9.zip |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull a single UEFI fix from Ard:
- Reduce the severity of the notice that appears when the ESRT table points
to memory that is not covered by the memory map. It is scaring our users
and interfering with their nice splash screens. Note that the ESRT may still
be perfectly usable, and is currently (to my knowledge) not widely used to
begin with.
Diffstat (limited to 'drivers/media/pci/ivtv/ivtv-driver.c')
-rw-r--r-- | drivers/media/pci/ivtv/ivtv-driver.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c index ab2ae53618e8..e73c153285f0 100644 --- a/drivers/media/pci/ivtv/ivtv-driver.c +++ b/drivers/media/pci/ivtv/ivtv-driver.c @@ -59,6 +59,7 @@ #include <media/tveeprom.h> #include <media/i2c/saa7115.h> #include "tuner-xc2028.h" +#include <uapi/linux/sched/types.h> /* If you have already X v4l cards, then set this to X. This way the device numbers stay matched. Example: you have a WinTV card |