diff options
| author | Andi Kleen <ak@linux.intel.com> | 2008-08-21 02:44:21 -0400 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2008-08-21 02:44:21 -0400 |
| commit | f3853863b03519a18e1e38f55089544870d4b79c (patch) | |
| tree | 5fff0ac8752c250edd83b63a210364bbb96756f5 /drivers/acpi | |
| parent | 613e5f3376e48bd48494cf780b79b97b057d49a7 (diff) | |
| parent | 79c4375bf2df96d725475e0c061a4d78c3bd0884 (diff) | |
Merge branch 'compal-fix' into release-2.6.27
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/processor_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index d3f0a62efcc1..ee68ac54c0d4 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
| @@ -138,7 +138,7 @@ static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = { | |||
| 138 | { | 138 | { |
| 139 | set_no_mwait, "Extensa 5220", { | 139 | set_no_mwait, "Extensa 5220", { |
| 140 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), | 140 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), |
| 141 | DMI_MATCH(DMI_SYS_VENDOR, "ACER"), | 141 | DMI_MATCH(DMI_SYS_VENDOR, "Acer"), |
| 142 | DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), | 142 | DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), |
| 143 | DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL}, | 143 | DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL}, |
| 144 | {}, | 144 | {}, |