summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJerome Meinke <jerome.meinke@gmail.com>2013-08-19 17:15:45 +0200
committerMatthew Garrett <matthew.garrett@nebula.com>2013-09-05 14:52:12 +0200
commit0be18a8e1133fc2cf668c90360fcd1a767f64faa (patch)
treeedf5fb4ee450ca93f153f2937ada638527c25749 /drivers
parentwmi: parse_wdg() should return kernel error codes (diff)
downloadlinux-0be18a8e1133fc2cf668c90360fcd1a767f64faa.tar.xz
linux-0be18a8e1133fc2cf668c90360fcd1a767f64faa.zip
amilo-rfkill: Enable using amilo-rfkill with the FSC Amilo L1310.
This change extends the amilo_rfkill_id_table[] with the DMI_BOARD_NAME information of the Amilo L1310, so that the wifi device can be switched on. Signed-off-by: Jerome Meinke <meinkej@informatik.uni-freiburg.de> Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/amilo-rfkill.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/platform/x86/amilo-rfkill.c b/drivers/platform/x86/amilo-rfkill.c
index 6296f078b7bc..da36b5e824d4 100644
--- a/drivers/platform/x86/amilo-rfkill.c
+++ b/drivers/platform/x86/amilo-rfkill.c
@@ -85,6 +85,13 @@ static const struct dmi_system_id amilo_rfkill_id_table[] = {
{
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+ DMI_MATCH(DMI_BOARD_NAME, "AMILO L1310"),
+ },
+ .driver_data = (void *)&amilo_a1655_rfkill_ops
+ },
+ {
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
DMI_MATCH(DMI_BOARD_NAME, "AMILO M7440"),
},
.driver_data = (void *)&amilo_m7440_rfkill_ops