aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2011-02-14 15:04:21 +0000
committerJohn Rigby <john.rigby@linaro.org>2011-03-16 15:59:49 -0600
commit1e4a4a286630ab73c6274bc650b083eec6459443 (patch)
tree21861929105a89c970b32112d5acedad12fd29cc /drivers
parent5c966ae29f6efd1e07cf9a16ca2375683adf20a5 (diff)
UBUNTU: SAUCE: Dell All-In-One: Remove need for Dell module alias
The driver originally used a workaround to load the All-In-One module based on a Dell DMI module alias. Since the WMI sys interface supports the WMI GUIDs listed in the driver we can remove this unneccessary work around. Also, fix GUIDs to have no lower case hex characters. http://bugs.launchpad.net/bugs/718775 Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/dell-wmi-aio.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/platform/x86/dell-wmi-aio.c b/drivers/platform/x86/dell-wmi-aio.c
index 755c6d2e55d0..3dccbaa9fce3 100644
--- a/drivers/platform/x86/dell-wmi-aio.c
+++ b/drivers/platform/x86/dell-wmi-aio.c
@@ -32,7 +32,7 @@ MODULE_DESCRIPTION("WMI hotkeys driver for Dell All-In-One series");
MODULE_LICENSE("GPL");
#define EVENT_GUID1 "284A0E6B-380E-472A-921F-E52786257FB4"
-#define EVENT_GUID2 "02314822-307C-4F66-bf0E-48AEAEB26CC8"
+#define EVENT_GUID2 "02314822-307C-4F66-BF0E-48AEAEB26CC8"
static char *dell_wmi_aio_guids[] = {
EVENT_GUID1,
@@ -40,10 +40,6 @@ static char *dell_wmi_aio_guids[] = {
NULL
};
-/* Temporary workaround until the WMI sysfs interface goes in.
- Borrowed from acer-wmi */
-MODULE_ALIAS("dmi:*:*Dell*:*:");
-
MODULE_ALIAS("wmi:"EVENT_GUID1);
MODULE_ALIAS("wmi:"EVENT_GUID2);