diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-07-24 08:05:44 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-07-24 08:05:44 -0700 |
| commit | 0606263f24f3d64960de742c55894190b5df903b (patch) | |
| tree | 673894f227c1a761f601ad7bdc1ceef003bb85cb /drivers/acpi/Makefile | |
| parent | a72255983f12f31f0c8d8275fb1a781546cfacb7 (diff) | |
| parent | d4c5725d57323e2348940fcc6416072671a9b432 (diff) | |
Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-nextlibnvdimm-for-4.8
Diffstat (limited to 'drivers/acpi/Makefile')
| -rw-r--r-- | drivers/acpi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85a66fb..64a575a6f7ef 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -70,7 +70,7 @@ obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o obj-$(CONFIG_ACPI_PROCESSOR) += processor.o obj-$(CONFIG_ACPI) += container.o obj-$(CONFIG_ACPI_THERMAL) += thermal.o -obj-$(CONFIG_ACPI_NFIT) += nfit.o +obj-$(CONFIG_ACPI_NFIT) += nfit/ obj-$(CONFIG_ACPI) += acpi_memhotplug.o obj-$(CONFIG_ACPI_HOTPLUG_IOAPIC) += ioapic.o obj-$(CONFIG_ACPI_BATTERY) += battery.o |