From d3bc735dce186adb6de535907303664e6ff421c4 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Fri, 2 Sep 2005 17:16:48 -0400
Subject: [PATCH] --- yaml --- r: 7843 b: refs/heads/master c:
 8713cbefafbb5a101ade541a4b0ffa108bf697cc h: refs/heads/master i:   7841:
 4a15beabf8fe0ea8227392869f50faee42c8e721   7839:
 81ae656bb59367a46e6ad14979fc48985d34dbc5 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/acpi/osl.c            | 2 +-
 trunk/drivers/acpi/pci_bind.c       | 3 ++-
 trunk/drivers/acpi/processor_core.c | 2 +-
 trunk/drivers/acpi/scan.c           | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8ad6b1b931df..7c2fc7bb9bfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aff8c2777d1a9edf97f26bf60579f9c931443eb1
+refs/heads/master: 8713cbefafbb5a101ade541a4b0ffa108bf697cc
diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c
index dc69d8760a54..d528c750a380 100644
--- a/trunk/drivers/acpi/osl.c
+++ b/trunk/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/trunk/drivers/acpi/pci_bind.c b/trunk/drivers/acpi/pci_bind.c
index a4955685e4c0..2a718df769b5 100644
--- a/trunk/drivers/acpi/pci_bind.c
+++ b/trunk/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/trunk/drivers/acpi/processor_core.c b/trunk/drivers/acpi/processor_core.c
index 819cb0b453fc..421792562642 100644
--- a/trunk/drivers/acpi/processor_core.c
+++ b/trunk/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/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
index 8a3ea41063ec..c6db591479de 100644
--- a/trunk/drivers/acpi/scan.c
+++ b/trunk/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;