summaryrefslogtreecommitdiffstats
path: root/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-10 09:14:00 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-10 09:14:00 -0400
commit35ac9a875942baf213b210ef2954da4fa0f3b463 (patch)
treee2ed984e81584a9a89cac4ba17a8e7ee65f690aa /acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
parentc01ddf0dcd7e42362ea1be6489b7da7500032c24 (diff)
downloadkernel-35ac9a875942baf213b210ef2954da4fa0f3b463.tar.gz
kernel-35ac9a875942baf213b210ef2954da4fa0f3b463.tar.xz
kernel-35ac9a875942baf213b210ef2954da4fa0f3b463.zip
Linux v3.17-6136-gc798360cd143
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 cea06c30f..986bce9cb 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 3abe9b223ba7..ee8f11cf65da 100644
+index 9964f70be98d..d95d258f606c 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -44,6 +44,7 @@
@@ -24,7 +24,7 @@ index 3abe9b223ba7..ee8f11cf65da 100644
#include <asm/io.h>
#include <asm/uaccess.h>
-@@ -245,7 +246,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
+@@ -255,7 +256,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
acpi_physical_address __init acpi_os_get_root_pointer(void)
{
#ifdef CONFIG_KEXEC