diff --git a/[refs] b/[refs]
index f55858c2e594..48cab5906ba1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab46feae865c5b96dbf5e261be8638165932bfb1
+refs/heads/master: 8b12b922ed5b9b6bfc345d3d6c6de56b2982af7f
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
index 8ff510b91d88..b8f5c005fbb5 100644
--- a/trunk/drivers/acpi/scan.c
+++ b/trunk/drivers/acpi/scan.c
@@ -530,11 +530,10 @@ static int acpi_device_register(struct acpi_device *device,
 	if (device->parent)
 		device->dev.parent = &parent->dev;
 	device->dev.bus = &acpi_bus_type;
-	device_initialize(&device->dev);
 	device->dev.release = &acpi_device_release;
-	result = device_add(&device->dev);
+	result = device_register(&device->dev);
 	if(result) {
-		dev_err(&device->dev, "Error adding device\n");
+		dev_err(&device->dev, "Error registering device\n");
 		goto end;
 	}