aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2009-05-13 11:38:45 -0600
committerLeann Ogasawara <leann.ogasawara@canonical.com>2010-07-23 11:27:41 +0200
commit08f6764d92bd233f5df350c1a008eef62c815dae (patch)
treec0ff798df666aaf1fb64c84a1655c0e88c4824e3 /drivers
parentfc5fff4b741a9180b5d681cfd36250a6477d25aa (diff)
UBUNTU: SAUCE: Add MODULE_ALIAS for Dell WMI module
From Mario Limonciello: Until the sysfs WMI interface is ready, there is no way to automatically determine when to load dell-wmi. The equivalent module for Acer laptops, acer-wmi has a workaround in place to match on the DMI tables for the machine. This type of solution works on for Dell as well and gets the module loading when necessary. Upstream is not in favor of applying this patch, but rather waiting for the sysfs interface to be ready. Until it is, this provides a solution to ensure machines that support WMI hotkeys are functional. OriginalAuthor: mario_limonciello@dell.com Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/dell-wmi.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
index 66f53c3c35e..830be3ca8bc 100644
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@ -44,6 +44,10 @@ static int acpi_video;
MODULE_ALIAS("wmi:"DELL_EVENT_GUID);
+/* Temporary workaround until the WMI sysfs interface goes in.
+ Borrowed from acer-wmi */
+MODULE_ALIAS("dmi:*:*Dell*:*:");
+
struct key_entry {
char type; /* See KE_* below */
u16 code;