summaryrefslogtreecommitdiffstats
path: root/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-06-26 09:33:38 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-06-26 09:33:38 -0400
commit35eff41288ccf2a1ddd555db0b0e51906af970a0 (patch)
tree761d7f671ba27b4a314aa72a864f9a3a56dc7d5b /acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
parent21694f1b769f352163ed762b519cc7155dd1c97d (diff)
downloadkernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.tar.gz
kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.tar.xz
kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.zip
Linux v4.1-5596-gaefbef10e3ae
Diffstat (limited to 'acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch')
-rw-r--r--acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
index 5d606a984..cf0e5b492 100644
--- a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
+++ b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
@@ -13,7 +13,7 @@ Signed-off-by: Josh Boyer <jwboyer@redhat.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
-index 7ccba395c9dd..9cbdbccf3dc3 100644
+index a5dc9034efee..fd2aee6de6a7 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -44,6 +44,7 @@
@@ -24,7 +24,7 @@ index 7ccba395c9dd..9cbdbccf3dc3 100644
#include <asm/io.h>
#include <asm/uaccess.h>
-@@ -252,7 +253,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
+@@ -248,7 +249,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
acpi_physical_address __init acpi_os_get_root_pointer(void)
{
#ifdef CONFIG_KEXEC