From bac6e37beeb5347cc5b947bba97aa44e2e03728b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 9 Feb 2011 13:19:03 -0800 Subject: [PATCH] --- yaml --- r: 235903 b: refs/heads/master c: aa72eb0778be48edfeacc51c24c9617f1a1947b5 h: refs/heads/master i: 235901: 90d63deb3fd879327b7f474dfc951b2603c5f753 235899: d19086c77f630769d042bccef3940178d4ee2dcd 235895: aa948119b37f78bf2ec471714dfd8087decd0dd0 235887: b2ee6efeee99c74f3b8b09299af60ce2cc245929 235871: edcd418b475f7759aa2aaa628df7b4c6a66040ae 235839: 8f774e589d62e98abaddfafd0aedf60fddbba9e2 235775: ab075ac66fe230e2e4d40a2048c5ef60975a4cd2 v: v3 --- [refs] | 2 +- .../staging/samsung-laptop/samsung-laptop.c | 50 ++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 173c7ae3ff3f..f3b4fa02ee37 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78a2fcb4fe1b3dc626da56fac7912e7091425892 +refs/heads/master: aa72eb0778be48edfeacc51c24c9617f1a1947b5 diff --git a/trunk/drivers/staging/samsung-laptop/samsung-laptop.c b/trunk/drivers/staging/samsung-laptop/samsung-laptop.c index 5b2059d8da1d..51ec6216b1ea 100644 --- a/trunk/drivers/staging/samsung-laptop/samsung-laptop.c +++ b/trunk/drivers/staging/samsung-laptop/samsung-laptop.c @@ -1,5 +1,5 @@ /* - * Samsung N130 Laptop driver + * Samsung Laptop driver * * Copyright (C) 2009 Greg Kroah-Hartman (gregkh@suse.de) * Copyright (C) 2009 Novell Inc. @@ -544,6 +544,54 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = { }, .callback = dmi_check_cb, }, + { + .ident = "X360", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, + "SAMSUNG ELECTRONICS CO., LTD."), + DMI_MATCH(DMI_PRODUCT_NAME, "X360"), + DMI_MATCH(DMI_BOARD_NAME, "X360"), + }, + .callback = dmi_check_cb, + }, + { + .ident = "R518", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, + "SAMSUNG ELECTRONICS CO., LTD."), + DMI_MATCH(DMI_PRODUCT_NAME, "R518"), + DMI_MATCH(DMI_BOARD_NAME, "R518"), + }, + .callback = dmi_check_cb, + }, + { + .ident = "N150/N210/N220", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, + "SAMSUNG ELECTRONICS CO., LTD."), + DMI_MATCH(DMI_PRODUCT_NAME, "N150/N210/N220"), + DMI_MATCH(DMI_BOARD_NAME, "N150/N210/N220"), + }, + .callback = dmi_check_cb, + }, + { + .ident = "R530/R730", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), + DMI_MATCH(DMI_PRODUCT_NAME, "R530/R730"), + DMI_MATCH(DMI_BOARD_NAME, "R530/R730"), + }, + .callback = dmi_check_cb, + }, + { + .ident = "NF110/NF210/NF310", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), + DMI_MATCH(DMI_PRODUCT_NAME, "NF110/NF210/NF310"), + DMI_MATCH(DMI_BOARD_NAME, "NF110/NF210/NF310"), + }, + .callback = dmi_check_cb, + }, { }, }; MODULE_DEVICE_TABLE(dmi, samsung_dmi_table);