Merge remote-tracking branch 'torvalds/master' into perf/core

[sfrench/cifs-2.6.git] / drivers / acpi / Makefile

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 52b627c7f9772ccf46286b152732bcbb2d6dcfb1..700b41adf2db6dd82f272b5a0983d89a9ff7b00e 100644 (file)
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -57,6 +57,7 @@ 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_FPDT)       += acpi_fpdt.o
 acpi-$(CONFIG_ACPI_LPIT)       += acpi_lpit.o
 acpi-$(CONFIG_ACPI_GENERIC_GSI) += irq.o
 acpi-$(CONFIG_ACPI_WATCHDOG)   += acpi_watchdog.o