[ACPI] fix build errors resulting from auto-merge

Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 9a4f5ec5cd9750d0e4d338e0e356fda06dca230c..da2e35c1d37316ce8f874be9c931e48278de18c6 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1012,7 +1012,7 @@ static int acpi_bus_scan (struct acpi_device      *start)
 
        return_VALUE(0);
 }
-EXPORT_SYMBOL(acpi_bus_register_driver);
+EXPORT_SYMBOL(acpi_bus_scan);
 
 
 static int
@@ -1040,7 +1040,6 @@ acpi_bus_scan_fixed (
 
        return_VALUE(result);
 }
-EXPORT_SYMBOL(acpi_bus_unregister_driver);
 
 
 static int __init acpi_scan_init(void)
@@ -1075,6 +1074,5 @@ static int __init acpi_scan_init(void)
  Done:
        return_VALUE(result);
 }
-EXPORT_SYMBOL(acpi_bus_scan);
 
 subsys_initcall(acpi_scan_init);

diff --git a/drivers/acpi/tables/tbconvrt.c b/drivers/acpi/tables/tbconvrt.c
index 712498d461180584a85bf446343a29fd6592aed9..65a90b3c83d49d2a392373a63842065cdbfbe385 100644 (file)
--- a/drivers/acpi/tables/tbconvrt.c
+++ b/drivers/acpi/tables/tbconvrt.c
@@ -52,6 +52,7 @@
 
 
 u8 acpi_fadt_is_v1;
+EXPORT_SYMBOL(acpi_fadt_is_v1);
 
 /*******************************************************************************
  *