From d6cffc81923a32d07d9deffa15229f06ff5b02dd Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Mon, 21 Sep 2009 19:29:45 +0000
Subject: [PATCH] --- yaml --- r: 166383 b: refs/heads/master c:
 adc08e2035f1859d4b129f42b2c2305ef090d226 h: refs/heads/master i:   166381:
 a583597c01ce64780060e4ada2aefd28cb6b61fd   166379:
 7affa2f8599b8cbfa6b33512f3386a00f1305db5   166375:
 395cc2b26e9ba68d80763a00f05b1c327a3b4224   166367:
 0f72d85bcdd673e7e06e3e0cf161a4d8692c6b33 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/acpi/scan.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ca6c2cfe3887..fcb3f13f6e4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e029bf0a611ea3995bd1fae0285cbaf6eed7f16
+refs/heads/master: adc08e2035f1859d4b129f42b2c2305ef090d226
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
index 4fe73596c5d3..27d2dec55c6c 100644
--- a/trunk/drivers/acpi/scan.c
+++ b/trunk/drivers/acpi/scan.c
@@ -1650,10 +1650,10 @@ int __init acpi_scan_init(void)
 	/*
 	 * Enumerate devices in the ACPI namespace.
 	 */
-	result = acpi_bus_scan_fixed();
+	result = acpi_bus_scan(acpi_root->handle, &ops);
 
 	if (!result)
-		result = acpi_bus_scan(acpi_root->handle, &ops);
+		result = acpi_bus_scan_fixed();
 
 	if (result)
 		acpi_device_unregister(acpi_root, ACPI_BUS_REMOVAL_NORMAL);