ACPI: Delete Intel Customer Reference Board (CRB) from OSI(Linux) DMI list

Linux does not want BIOS writers to invoke _OSI(Linux) -
for in the field it causes more Windows incompatibility problems
than it solves.

So when it is seen in the BIOS for an Intel Customer Reference Board,
Linux should ignore its effect by default, and should complain loudly.
Otherwise, the reference BIOS will go unfixed, and the bad BIOS
will spread to the field.

Users of this board can get the old behavior with "acpi_osi=Linux"

As this was the only entry, delete acpi_osl_dmi_table[].

Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 2203153b5402034aeb1fd7442387aadc68a02cf2..15f095ea795ec00b1d6ec65a4489597d348a6eed 100644 (file)
--- a/drivers/acpi/osl.c
+++ b/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