summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-01-16 20:45:34 +0100
committerLen Brown <len.brown@intel.com>2009-01-16 20:45:34 +0100
commit88d998c264722cd6e8fafa42aee191f7d9194960 (patch)
tree72cfd34df16be3e6778ab585c8324e8f5677fe21 /drivers/acpi
parentMerge branch 'thinkpad-acpi' into release (diff)
parentACPI: rename main.c to sleep.c (diff)
downloadlinux-88d998c264722cd6e8fafa42aee191f7d9194960.tar.xz
linux-88d998c264722cd6e8fafa42aee191f7d9194960.zip
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/Makefile2
-rw-r--r--drivers/acpi/sleep.c (renamed from drivers/acpi/main.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index d80f4cc2e0da..65d90c720b5a 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -19,7 +19,7 @@ obj-y += osl.o utils.o reboot.o\
# sleep related files
obj-y += wakeup.o
-obj-y += main.o
+obj-y += sleep.o
obj-$(CONFIG_ACPI_SLEEP) += proc.o
diff --git a/drivers/acpi/main.c b/drivers/acpi/sleep.c
index 7e3c609cbef2..7e3c609cbef2 100644
--- a/drivers/acpi/main.c
+++ b/drivers/acpi/sleep.c