diff options
author | Len Brown <len.brown@intel.com> | 2008-01-25 15:39:50 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-03 17:37:02 -0500 |
commit | 8964ebb8c35533f4084cc667079a0ce620356104 (patch) | |
tree | 2505d18f2e5bdaf87a099778124dd9a74aa433b8 /drivers | |
parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) |
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')
-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 = { | |||
214 | * _OSI(Linux) effect unknown: | 214 | * _OSI(Linux) effect unknown: |
215 | * DMI_MATCH(DMI_PRODUCT_NAME, "Ferrari 5000"), | 215 | * DMI_MATCH(DMI_PRODUCT_NAME, "Ferrari 5000"), |
216 | */ | 216 | */ |
217 | { | 217 | /* |
218 | .callback = dmi_disable_osi_linux, | 218 | * note that dmi_check_system() uses strstr() |
219 | .ident = "Acer, inc.", | 219 | * to match sub-strings rather than !strcmp(), |
220 | .matches = { | 220 | * so "Acer" below matches "Acer, inc." above. |
221 | DMI_MATCH(DMI_SYS_VENDOR, "Acer, inc."), | 221 | */ |
222 | }, | ||
223 | }, | ||
224 | /* | 222 | /* |
225 | * Disable OSI(Linux) warnings on all "Acer" | 223 | * Disable OSI(Linux) warnings on all "Acer" |
226 | * | 224 | * |