summaryrefslogtreecommitdiffstats
path: root/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-05-15 09:17:22 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-05-15 09:17:22 -0400
commitea896256a407513f86b4e11d4c8bd83fe4d6a747 (patch)
tree8fe5b6050bd59327090713040bb43f03c3e12c82 /acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
parent2844a7d7e1ae32cc002d5dcf1e1181dc6934cb14 (diff)
downloadkernel-ea896256a407513f86b4e11d4c8bd83fe4d6a747.tar.gz
kernel-ea896256a407513f86b4e11d4c8bd83fe4d6a747.tar.xz
kernel-ea896256a407513f86b4e11d4c8bd83fe4d6a747.zip
Linux v4.1-rc3-177-gf0897f4cc0fc
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 bb0e0c7e8..5d606a984 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 39748bb3a543..72edfeedb326 100644
+index 7ccba395c9dd..9cbdbccf3dc3 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -44,6 +44,7 @@
@@ -24,7 +24,7 @@ index 39748bb3a543..72edfeedb326 100644
#include <asm/io.h>
#include <asm/uaccess.h>
-@@ -255,7 +256,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
+@@ -252,7 +253,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
acpi_physical_address __init acpi_os_get_root_pointer(void)
{
#ifdef CONFIG_KEXEC