diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /drivers/misc/acer-wmi.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/misc/acer-wmi.c')
| -rw-r--r-- | drivers/misc/acer-wmi.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c index d7aea93081f2..74d12b4a3abd 100644 --- a/drivers/misc/acer-wmi.c +++ b/drivers/misc/acer-wmi.c | |||
| @@ -273,6 +273,15 @@ static struct dmi_system_id acer_quirks[] = { | |||
| 273 | }, | 273 | }, |
| 274 | { | 274 | { |
| 275 | .callback = dmi_matched, | 275 | .callback = dmi_matched, |
| 276 | .ident = "Acer TravelMate 4200", | ||
| 277 | .matches = { | ||
| 278 | DMI_MATCH(DMI_SYS_VENDOR, "Acer"), | ||
| 279 | DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4200"), | ||
| 280 | }, | ||
| 281 | .driver_data = &quirk_acer_travelmate_2490, | ||
| 282 | }, | ||
| 283 | { | ||
| 284 | .callback = dmi_matched, | ||
| 276 | .ident = "Medion MD 98300", | 285 | .ident = "Medion MD 98300", |
| 277 | .matches = { | 286 | .matches = { |
| 278 | DMI_MATCH(DMI_SYS_VENDOR, "MEDION"), | 287 | DMI_MATCH(DMI_SYS_VENDOR, "MEDION"), |