diff options
| author | Corentin Chary <corentincj@iksaif.net> | 2011-02-26 10:20:31 +0100 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:07:20 -0400 |
| commit | e12e6d94db24e9050821965aa75c95e8d2c65f10 (patch) | |
| tree | 9d747a02982309c27206720d2f6699db9e532dff /drivers/platform/x86/Makefile | |
| parent | 5b799d4fb787bb94f1068352220ab033ac7969f8 (diff) | |
eeepc-wmi: asus generic asus-wmi.ko module
New Asus notebooks are using a WMI device similar to
the one used in Eee PCs. Since we don't want to load
eeepc-wmi module on Asus notebooks, and we want to
keep the eeepc-wmi module for backward compatibility,
this patch introduce a new module, named asus-wmi, that
will be used by eeepc-wmi and the new Asus Notebook WMI
Driver.
eeepc-wmi's input device strings (device name and phys)
are kept, but rfkill and led names are changed (s/eeepc/asus/).
This should not break anything since rfkill are used by type or
index, not by name, and the eeepc::touchpad led wasn't working
correctly before 2.6.39 anyway.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform/x86/Makefile')
| -rw-r--r-- | drivers/platform/x86/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 443257617b20..f9c83f48c922 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -3,8 +3,9 @@ # x86 Platform-Specific Drivers # obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o +obj-$(CONFIG_ASUS_WMI) += asus-wmi.o obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o -obj-$(CONFIG_EEEPC_WMI) += asus-wmi.o eeepc-wmi.o +obj-$(CONFIG_EEEPC_WMI) += eeepc-wmi.o obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o obj-$(CONFIG_ACPI_CMPC) += classmate-laptop.o obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o |