diff options
| author | Len Brown <len.brown@intel.com> | 2008-01-25 21:39:50 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-03 23:37:02 +0100 |
| commit | 8964ebb8c35533f4084cc667079a0ce620356104 (patch) | |
| tree | 2505d18f2e5bdaf87a099778124dd9a74aa433b8 /drivers/acpi/blacklist.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-8964ebb8c35533f4084cc667079a0ce620356104.tar.xz linux-8964ebb8c35533f4084cc667079a0ce620356104.zip | |
ACPI: remove redundant Acer blacklist entry
dmi_check_system() does sub-string matching using strstr(),
rather than exact string compares with !strcmp().
So delete the longer of the Acer blacklist entries, as its
function is just a redundant console message.
Spotted-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/blacklist.c')
| -rw-r--r-- | drivers/acpi/blacklist.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index 8809654d6cc9..9ace2194f2ef 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c @@ -214,13 +214,11 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { * _OSI(Linux) effect unknown: * DMI_MATCH(DMI_PRODUCT_NAME, "Ferrari 5000"), */ - { - .callback = dmi_disable_osi_linux, - .ident = "Acer, inc.", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer, inc."), - }, - }, + /* + * note that dmi_check_system() uses strstr() + * to match sub-strings rather than !strcmp(), + * so "Acer" below matches "Acer, inc." above. + */ /* * Disable OSI(Linux) warnings on all "Acer" * |