summaryrefslogtreecommitdiff
path: root/drivers/platform
diff options
context:
space:
mode:
authorCorentin Chary <corentincj@iksaif.net>2011-02-26 12:20:30 +0300
committerMatthew Garrett <mjg@redhat.com>2011-03-28 14:07:20 +0400
commit5b799d4fb787bb94f1068352220ab033ac7969f8 (patch)
tree2a3b7ca5ddafc8c303a9c190b40f0246e81118f3 /drivers/platform
parentf017fbe7993d8416824aaf079fa1e6dc88d1ba55 (diff)
downloadlinux-5b799d4fb787bb94f1068352220ab033ac7969f8.tar.xz
asus-wmi: move generic code to asus-wmi
New Asus notebooks are using a WMI device similar to the one used in Eee PCs. Since we don't want to load a module named eeepc-laptop on Asus Notebooks, start by copying all the code to asus-wmi.c. Signed-off-by: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/Makefile2
-rw-r--r--drivers/platform/x86/asus-wmi.c (renamed from drivers/platform/x86/eeepc-wmi.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index a9877711b3f1..443257617b20 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -4,7 +4,7 @@
#
obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o
obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o
-obj-$(CONFIG_EEEPC_WMI) += eeepc-wmi.o
+obj-$(CONFIG_EEEPC_WMI) += asus-wmi.o eeepc-wmi.o
obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
obj-$(CONFIG_ACPI_CMPC) += classmate-laptop.o
obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/asus-wmi.c
index d3997757e790..d3997757e790 100644
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c