Skip to content

L
linux
Commit 2fc000fb authored by Len Brown's avatar Len Brown
Browse files
Options

[ACPI] fix build errors resulting from auto-merge 

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent d569d6be
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
drivers/acpi/scan.c
View file @ 2fc000fb
...@@ -1012,7 +1012,7 @@ static int acpi_bus_scan (struct acpi_device *start) ...@@ -1012,7 +1012,7 @@ static int acpi_bus_scan (struct acpi_device *start)
return_VALUE(0); return_VALUE(0);
} }
EXPORT_SYMBOL(acpi_bus_register_driver); EXPORT_SYMBOL(acpi_bus_scan);
static int static int
...@@ -1040,7 +1040,6 @@ acpi_bus_scan_fixed ( ...@@ -1040,7 +1040,6 @@ acpi_bus_scan_fixed (
return_VALUE(result); return_VALUE(result);
} }
EXPORT_SYMBOL(acpi_bus_unregister_driver);
static int __init acpi_scan_init(void) static int __init acpi_scan_init(void)
...@@ -1075,6 +1074,5 @@ static int __init acpi_scan_init(void) ...@@ -1075,6 +1074,5 @@ static int __init acpi_scan_init(void)
Done: Done:
return_VALUE(result); return_VALUE(result);
} }
EXPORT_SYMBOL(acpi_bus_scan);
subsys_initcall(acpi_scan_init); subsys_initcall(acpi_scan_init);
drivers/acpi/tables/tbconvrt.c
View file @ 2fc000fb
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
u8 acpi_fadt_is_v1; u8 acpi_fadt_is_v1;
EXPORT_SYMBOL(acpi_fadt_is_v1);
/******************************************************************************* /*******************************************************************************
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7