diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-16 14:45:34 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-16 14:45:34 -0500 |
| commit | 88d998c264722cd6e8fafa42aee191f7d9194960 (patch) | |
| tree | 72cfd34df16be3e6778ab585c8324e8f5677fe21 /drivers/acpi | |
| parent | 79491ca416347f9e3c51993db556ba78bef44afa (diff) | |
| parent | d08ca2ca743f324eceba59e93188f9439e966bce (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/Makefile | 2 | ||||
| -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\ | |||
| 19 | 19 | ||
| 20 | # sleep related files | 20 | # sleep related files |
| 21 | obj-y += wakeup.o | 21 | obj-y += wakeup.o |
| 22 | obj-y += main.o | 22 | obj-y += sleep.o |
| 23 | obj-$(CONFIG_ACPI_SLEEP) += proc.o | 23 | obj-$(CONFIG_ACPI_SLEEP) += proc.o |
| 24 | 24 | ||
| 25 | 25 | ||
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 | |||