diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index dc69d8760a5460af8f044882c747ea97d163d51e..d528c750a3801bd65591639baec49d3f64a381fe 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1040,7 +1040,7 @@ static int __init acpi_wake_gpes_always_on_setup(char *str)
 
 __setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);
 
-int __init acpi_hotkey_setup(char *str)
+static int __init acpi_hotkey_setup(char *str)
 {
 	acpi_specific_hotkey_enabled = FALSE;
 	return 1;
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index a4955685e4c01523a7d1d0747ef248f053f2fc18..2a718df769b546ee533e55dc96fa5e8cdd510625 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -44,7 +44,8 @@ struct acpi_pci_data {
 	struct pci_dev *dev;
 };
 
-void acpi_pci_data_handler(acpi_handle handle, u32 function, void *context)
+static void acpi_pci_data_handler(acpi_handle handle, u32 function,
+				  void *context)
 {
 	ACPI_FUNCTION_TRACE("acpi_pci_data_handler");
 
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 819cb0b453fc09e43738d02832263bc851462b72..4217925626423db1f39cc76880e95f700fb5d279 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -221,7 +221,7 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)
 	return_VALUE(0);
 }
 
-int acpi_processor_errata(struct acpi_processor *pr)
+static int acpi_processor_errata(struct acpi_processor *pr)
 {
 	int result = 0;
 	struct pci_dev *dev = NULL;
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 8a3ea41063ec53ce4302601bf3a75d6c5617b266..c6db591479de3e02504d40ac8e0cee2d2bebdeab 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -527,7 +527,7 @@ acpi_bus_driver_init(struct acpi_device *device, struct acpi_driver *driver)
 	return_VALUE(0);
 }
 
-int acpi_start_single_object(struct acpi_device *device)
+static int acpi_start_single_object(struct acpi_device *device)
 {
 	int result = 0;
 	struct acpi_driver *driver;