aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorIke Panhc <ike.pan@canonical.com>2010-10-01 03:40:09 -0400
committerMatthew Garrett <mjg@redhat.com>2010-10-21 09:36:51 -0400
commit57ac3b051cc09693f2e0f4725c87091ab11c7318 (patch)
treec2bd612211ebf861808ac40ef18f1ce8ecdde271 /drivers/platform
parentfa08359ee29bd0dc52a4281d0e482fff08664b96 (diff)
ideapad: Change the driver name to ideapad-laptop
Since the platform drivers doing more for laptops than just using specific ACPI device. It will be good to change the name from *_acpi to *-laptop. Reference: http://lkml.org/lkml/2010/8/14/154 Signed-off-by: Ike Panhc <ike.pan@canonical.com> Acked-by: Len Brown <len.brown@intel.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/Kconfig4
-rw-r--r--drivers/platform/x86/Makefile2
-rw-r--r--drivers/platform/x86/ideapad-laptop.c (renamed from drivers/platform/x86/ideapad_acpi.c)0
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 55579f137b64..b49f9b143a7f 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -222,8 +222,8 @@ config SONYPI_COMPAT
222 ---help--- 222 ---help---
223 Build the sonypi driver compatibility code into the sony-laptop driver. 223 Build the sonypi driver compatibility code into the sony-laptop driver.
224 224
225config IDEAPAD_ACPI 225config IDEAPAD_LAPTOP
226 tristate "Lenovo IdeaPad ACPI Laptop Extras" 226 tristate "Lenovo IdeaPad Laptop Extras"
227 depends on ACPI 227 depends on ACPI
228 depends on RFKILL 228 depends on RFKILL
229 help 229 help
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 85fb2b84f57e..9846fa2f7cc4 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_ACERHDF) += acerhdf.o
15obj-$(CONFIG_HP_WMI) += hp-wmi.o 15obj-$(CONFIG_HP_WMI) += hp-wmi.o
16obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o 16obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o
17obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o 17obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o
18obj-$(CONFIG_IDEAPAD_ACPI) += ideapad_acpi.o 18obj-$(CONFIG_IDEAPAD_LAPTOP) += ideapad_laptop.o
19obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o 19obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o
20obj-$(CONFIG_FUJITSU_LAPTOP) += fujitsu-laptop.o 20obj-$(CONFIG_FUJITSU_LAPTOP) += fujitsu-laptop.o
21obj-$(CONFIG_PANASONIC_LAPTOP) += panasonic-laptop.o 21obj-$(CONFIG_PANASONIC_LAPTOP) += panasonic-laptop.o
diff --git a/drivers/platform/x86/ideapad_acpi.c b/drivers/platform/x86/ideapad-laptop.c
index e9f7395efc3a..e9f7395efc3a 100644
--- a/drivers/platform/x86/ideapad_acpi.c
+++ b/drivers/platform/x86/ideapad-laptop.c