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/block/paride/pf.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/block/paride/pf.c')
-rw-r--r-- | drivers/block/paride/pf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c index ed93e8badf56..14c5d32f5d8b 100644 --- a/drivers/block/paride/pf.c +++ b/drivers/block/paride/pf.c @@ -59,7 +59,7 @@ the slower the port i/o. In some cases, setting this to zero will speed up the device. (default -1) - major You may use this parameter to overide the + major You may use this parameter to override the default major number (47) that this driver will use. Be sure to change the device name as well. |