diff options
| author | James Morris <jmorris@namei.org> | 2008-09-22 02:41:56 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-09-22 02:41:56 +0200 |
| commit | ab2b49518e743962f71b94246855c44ee9cf52cc (patch) | |
| tree | 26b260a350f0a0a0d19b558bf147b812e3a1564c /drivers/misc/fujitsu-laptop.c | |
| parent | Update selinux info in MAINTAINERS and Kconfig help text (diff) | |
| parent | Linux 2.6.27-rc7 (diff) | |
| download | linux-ab2b49518e743962f71b94246855c44ee9cf52cc.tar.xz linux-ab2b49518e743962f71b94246855c44ee9cf52cc.zip | |
Merge branch 'master' into next
Conflicts:
MAINTAINERS
Thanks for breaking my tree :-)
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/misc/fujitsu-laptop.c')
| -rw-r--r-- | drivers/misc/fujitsu-laptop.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/misc/fujitsu-laptop.c index 7a1ef6c262de..3e56203e4947 100644 --- a/drivers/misc/fujitsu-laptop.c +++ b/drivers/misc/fujitsu-laptop.c @@ -463,6 +463,13 @@ static struct dmi_system_id __initdata fujitsu_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK S6410"), }, .callback = dmi_check_cb_s6410}, + { + .ident = "FUJITSU LifeBook P8010", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook P8010"), + }, + .callback = dmi_check_cb_s6410}, {} }; |