aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/osl.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 2203153b5402..15f095ea795e 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -79,10 +79,6 @@ static char osi_additional_string[OSI_STRING_LENGTH_MAX];
79 79
80static int osi_linux; /* disable _OSI(Linux) by default */ 80static int osi_linux; /* disable _OSI(Linux) by default */
81 81
82#ifdef CONFIG_DMI
83static struct __initdata dmi_system_id acpi_osl_dmi_table[];
84#endif
85
86static void __init acpi_request_region (struct acpi_generic_address *addr, 82static void __init acpi_request_region (struct acpi_generic_address *addr,
87 unsigned int length, char *desc) 83 unsigned int length, char *desc)
88{ 84{
@@ -133,7 +129,6 @@ device_initcall(acpi_reserve_resources);
133 129
134acpi_status __init acpi_os_initialize(void) 130acpi_status __init acpi_os_initialize(void)
135{ 131{
136 dmi_check_system(acpi_osl_dmi_table);
137 return AE_OK; 132 return AE_OK;
138} 133}
139 134
@@ -1232,28 +1227,4 @@ acpi_os_validate_address (
1232 return AE_OK; 1227 return AE_OK;
1233} 1228}
1234 1229
1235#ifdef CONFIG_DMI
1236static int dmi_osi_linux(const struct dmi_system_id *d)
1237{
1238 printk(KERN_NOTICE "%s detected: enabling _OSI(Linux)\n", d->ident);
1239 enable_osi_linux(1);
1240 return 0;
1241}
1242
1243static struct dmi_system_id acpi_osl_dmi_table[] __initdata = {
1244 /*
1245 * Boxes that need _OSI(Linux)
1246 */
1247 {
1248 .callback = dmi_osi_linux,
1249 .ident = "Intel Napa CRB",
1250 .matches = {
1251 DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"),
1252 DMI_MATCH(DMI_BOARD_NAME, "MPAD-MSAE Customer Reference Boards"),
1253 },
1254 },
1255 {}
1256};
1257#endif /* CONFIG_DMI */
1258
1259#endif 1230#endif