diff --git a/[refs] b/[refs]
index 2e4edf46e7d9..c61e9b046112 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50b0075520a0acba9cabab5203bbce918b966d9a
+refs/heads/master: 6d47a5e4c3f8b6458002065d98a9cc6ff90fb597
diff --git a/trunk/drivers/pci/hotplug/acpiphp_glue.c b/trunk/drivers/pci/hotplug/acpiphp_glue.c
index ae67a8f55ba1..be7e91662417 100644
--- a/trunk/drivers/pci/hotplug/acpiphp_glue.c
+++ b/trunk/drivers/pci/hotplug/acpiphp_glue.c
@@ -997,7 +997,7 @@ static int acpiphp_bus_add(struct acpiphp_func *func)
  * @handle: handle to acpi namespace
  *
  */
-int acpiphp_bus_trim(acpi_handle handle)
+static int acpiphp_bus_trim(acpi_handle handle)
 {
 	struct acpi_device *device;
 	int retval;