---

yaml --- r: 58168 b: refs/heads/master c: aa2e09d h: refs/heads/master v: v3
git-mirror · Jul 3, 2007 · 2be078a · 2be078a
1 parent 2017eda
commit 2be078a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52c4d73a6cca0db2927b60935e57429f98eae7c1
+refs/heads/master: aa2e09da2a332e748532aa2a71b090e7e7c3203d
diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c
@@ -999,11 +999,11 @@ static int __init acpi_osi_setup(char *str)
 	if (str == NULL || *str == '\0') {
 		printk(KERN_INFO PREFIX "_OSI method disabled\n");
 		acpi_gbl_create_osi_method = FALSE;
+	} else if (!strcmp("!Linux", str)) {
+		enable_osi_linux(0);
 	} else if (*str == '!') {
 		if (acpi_osi_invalidate(++str) == AE_OK)
 			printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str);
-	} else if (!strcmp("!Linux", str)) {
-		enable_osi_linux(0);
 	} else if (!strcmp("Linux", str)) {
 		enable_osi_linux(1);
 	} else if (*osi_additional_string == '\0') {