Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / acpi / Makefile

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 44e4125..076894a 100644 (file)
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -54,6 +54,7 @@ acpi-y                                += property.o
 acpi-$(CONFIG_X86)             += acpi_cmos_rtc.o
 acpi-$(CONFIG_X86)             += x86/apple.o
 acpi-$(CONFIG_X86)             += x86/utils.o
+acpi-$(CONFIG_X86)             += x86/s2idle.o
 acpi-$(CONFIG_DEBUG_FS)                += debugfs.o
 acpi-y                         += acpi_lpat.o
 acpi-$(CONFIG_ACPI_LPIT)       += acpi_lpit.o