From d6d919365d031f0a1b7ce0672cb0b42cdc6a6667 Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Wed, 23 Jan 2008 20:06:41 -0500
Subject: [PATCH] --- yaml --- r: 75676 b: refs/heads/master c:
 7ce95ce5c6dbbc3f70933f04537860ffd9dbe17e h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/acpi/osl.c | 29 -----------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index 30ac02335af5..74b33a389138 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f40cd6fddcb1d51d8a2a67ddc81c14a3532f3cb7
+refs/heads/master: 7ce95ce5c6dbbc3f70933f04537860ffd9dbe17e
diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c
index 2203153b5402..15f095ea795e 100644
--- a/trunk/drivers/acpi/osl.c
+++ b/trunk/drivers/acpi/osl.c
@@ -79,10 +79,6 @@ static char osi_additional_string[OSI_STRING_LENGTH_MAX];
 
 static int osi_linux;		/* disable _OSI(Linux) by default */
 
-#ifdef CONFIG_DMI
-static struct __initdata dmi_system_id acpi_osl_dmi_table[];
-#endif
-
 static void __init acpi_request_region (struct acpi_generic_address *addr,
 	unsigned int length, char *desc)
 {
@@ -133,7 +129,6 @@ device_initcall(acpi_reserve_resources);
 
 acpi_status __init acpi_os_initialize(void)
 {
-	dmi_check_system(acpi_osl_dmi_table);
 	return AE_OK;
 }
 
@@ -1232,28 +1227,4 @@ acpi_os_validate_address (
     return AE_OK;
 }
 
-#ifdef CONFIG_DMI
-static int dmi_osi_linux(const struct dmi_system_id *d)
-{
-	printk(KERN_NOTICE "%s detected: enabling _OSI(Linux)\n", d->ident);
-	enable_osi_linux(1);
-	return 0;
-}
-
-static struct dmi_system_id acpi_osl_dmi_table[] __initdata = {
-	/*
-	 * Boxes that need _OSI(Linux)
-	 */
-	{
-	 .callback = dmi_osi_linux,
-	 .ident = "Intel Napa CRB",
-	 .matches = {
-		     DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"),
-		     DMI_MATCH(DMI_BOARD_NAME, "MPAD-MSAE Customer Reference Boards"),
-		     },
-	 },
-	{}
-};
-#endif /* CONFIG_DMI */
-
 #endif