From: Corentin Chary Date: Sat, 26 Feb 2011 09:20:30 +0000 (+0100) Subject: asus-wmi: move generic code to asus-wmi X-Git-Tag: v2.6.39-rc1~20^2^2~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b799d4fb787bb94f1068352220ab033ac7969f8;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: Matthew Garrett --- diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index a9877711b3f10..443257617b208 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 similarity index 100% rename from drivers/platform/x86/eeepc-wmi.c rename to drivers/platform/x86/asus-wmi.c