diff --git a/[refs] b/[refs]
index 6cb6d2b08531..5d9ec5006558 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39a0ad871000d2a016a4fa113a6e53d22aabf25d
+refs/heads/master: ea5c8af9b1241a10dc4ba6cd2d2362c179884b74
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
index 89c112ef9e14..91fed422bae8 100644
--- a/trunk/drivers/acpi/scan.c
+++ b/trunk/drivers/acpi/scan.c
@@ -1160,20 +1160,6 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)
 	return 0;
 }
 
-static int
-acpi_is_child_device(struct acpi_device *device,
-			int (*matcher)(struct acpi_device *))
-{
-	int result = -ENODEV;
-
-	do {
-		if (ACPI_SUCCESS(matcher(device)))
-			return AE_OK;
-	} while ((device = device->parent));
-
-	return result;
-}
-
 static int
 acpi_add_single_object(struct acpi_device **child,
 		       struct acpi_device *parent, acpi_handle handle, int type,