Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 23e5a0519af5..2815df66f6f7 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -185,6 +185,12 @@ static int __init dmi_disable_osi_vista(const struct dmi_system_id *d)
         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,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
                      DMI_MATCH(DMI_PRODUCT_NAME, "Sony VGN-SR290J"),
                 },
         },
+        {
+        .callback = dmi_disable_osi_win7,
+        .ident = "ASUS K50IJ",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "K50IJ"),
+                },
+        },
 
         /*
          * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.