--- drivers/acpi/blacklist.c

+++ drivers/acpi/blacklist.c

@@ -185,6 +185,12 @@ static int __init dmi_disable_osi_vista(

acpi_osi_setup("!Windows 2006");

return 0;

}

+static int __init dmi_disable_osi_win7(const struct dmi_system_id *d)

+{

+ printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);

+ acpi_osi_setup("!Windows 2009");

+ return 0;

+}

static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {

{

@@ -211,6 +217,38 @@ static struct dmi_system_id acpi_osi_dmi

DMI_MATCH(DMI_PRODUCT_NAME, "Sony VGN-SR290J"),

},

},

+ {

+ .callback = dmi_disable_osi_vista,

+ .ident = "Toshiba Satellite L355",

+ .matches = {

+ DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

+ DMI_MATCH(DMI_PRODUCT_VERSION, "Satellite L355"),

+ },

+ },

+ {

+ .callback = dmi_disable_osi_vista,

+ .ident = "Toshiba Satellite L355",

+ .matches = {

+ DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

+ DMI_MATCH(DMI_PRODUCT_VERSION, "Satellite L355"),

+ },

+ },

+ {

+ .callback = dmi_disable_osi_win7,

+ .ident = "ASUS K50IJ",

+ .matches = {

+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),

+ DMI_MATCH(DMI_PRODUCT_NAME, "K50IJ"),

+ },

+ },

+ {

+ .callback = dmi_disable_osi_vista,

+ .ident = "Toshiba P305D",

+ .matches = {

+ DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

+ DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P305D"),

+ },

+ },

/*

* BIOS invocation of _OSI(Linux) is almost always a BIOS bug.