Skip to contentSkip to conversation

platform/x86: move rfkill for Dell Mini 1012 to compal-laptop

PATCH Applied Victor van den Elzen 2 participants 2 messages Aug 14, 2010 – Aug 16, 2010

Subsystems (2)
x86 platform drivers Compal laptop support
lore
Share & tools
lore

Victor van den Elzen

author
#0 lore raw

PATCH 1/1 platform/x86: move rfkill for Dell Mini 1012 to compal-laptop

Like others in the Mini series, the Dell Mini 1012 does not support the smbios hook required by dell-laptop.

Signed-off-by Victor van den Elzen <[email protected]>
Cc stable <[email protected]>
---
 drivers/platform/x86/compal-laptop.c |    9 +++++++++
 drivers/platform/x86/dell-laptop.c   |    7 +++++++
 2 files changed, 16 insertions(+), 0 deletions(-)
drivers/platform/x86/compal-laptop.c +9 -0
index 71ff154..90111d7 100644
@@ -259,6 +259,14 @@ static struct dmi_system_id __initdata compal_dmi_table[] = {
 		.callback = dmi_check_cb
 	},
 	{
+		.ident = "Dell Mini 1012",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1012"),
+		},
+		.callback = dmi_check_cb
+	},
+	{
 		.ident = "Dell Inspiron 11z",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

@@ -375,5 +383,6 @@ MODULE_ALIAS("dmi:*:rnIFT00:rvrIFT00:*");
 MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron910:*");
 MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron1010:*");
 MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron1011:*");
+MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron1012:*");
 MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron1110:*");
 MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron1210:*");
drivers/platform/x86/dell-laptop.c +7 -0
index 661e3ac..6110601 100644
@@ -116,6 +116,13 @@ static struct dmi_system_id __devinitdata dell_blacklist[] = {
 		},
 	},
 	{
+		.ident = "Dell Mini 1012",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1012"),
+		},
+	},
+	{
 		.ident = "Dell Inspiron 11z",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

--
1.7.2.1