diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-21 10:22:45 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-21 10:22:45 +0200 |
| commit | 14764b01a5576ce23a9d0c95a027049206a19cef (patch) | |
| tree | fa7f4e3b9b62598076baf7d312dd37d6c91b0d56 /drivers/acpi/blacklist.c | |
| parent | Merge git://git.linaro.org/nico/arm_security into devel-stable (diff) | |
| parent | [ARM] Kirkwood: add missing machine targets to defconfig (diff) | |
| download | linux-14764b01a5576ce23a9d0c95a027049206a19cef.tar.xz linux-14764b01a5576ce23a9d0c95a027049206a19cef.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
Diffstat (limited to 'drivers/acpi/blacklist.c')
| -rw-r--r-- | drivers/acpi/blacklist.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index 2815df66f6f7..01381be05e96 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c @@ -218,6 +218,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { }, }, { + .callback = dmi_disable_osi_vista, + .ident = "VGN-NS50B_L", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NS50B_L"), + }, + }, + { .callback = dmi_disable_osi_win7, .ident = "ASUS K50IJ", .matches = { |