Commit c3f755e3 authored by Victor van den Elzen's avatar Victor van den Elzen Committed by Matthew Garrett
Browse files

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: default avatarVictor van den Elzen <victor.vde@gmail.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 2b754262

drivers/platform/x86/compal-laptop.c

+9 −0
Original line number Diff line number Diff line
@@ -840,6 +840,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 = {
@@ -1092,5 +1100,6 @@ MODULE_ALIAS("dmi:*:rnJHL90:rvrREFERENCE:*"); 
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
Original line number Diff line number Diff line
@@ -121,6 +121,13 @@ static struct dmi_system_id __devinitdata dell_blacklist[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1011"),

		},

	},

	{

		.ident = "Dell Mini 1012",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1012"),

		},

	},

	{

		.ident = "Dell Inspiron 11z",

		.matches = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE