diff options
| author |   Dan Williams <dan.j.williams@intel.com> | 2016-07-23 21:24:19 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-07-24 08:04:04 -0700 |
| commit | bdf97013ced5f263da0dc9d559f5c09e922d8423 (patch) | |
| tree | 15cf20f2abe71c49584ef9e06a0ba7210397e03a /tools | |
| parent | nfit, libnvdimm: allow an ARS scrub to be triggered on demand (diff) | |
| download | linux-dev-bdf97013ced5f263da0dc9d559f5c09e922d8423.tar.xz linux-dev-bdf97013ced5f263da0dc9d559f5c09e922d8423.zip | |
nfit: move to nfit/ sub-directory
With the arrival of x86-machine-check support the nfit driver will add a
(conditionally-compiled) source file. Prepare for this by moving all
nfit source to drivers/acpi/nfit/. This is pure code movement, no
functional changes.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | tools/testing/nvdimm/Kbuild | 4 | ||||
| -rw-r--r-- | tools/testing/nvdimm/test/Kbuild | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/testing/nvdimm/Kbuild b/tools/testing/nvdimm/Kbuild index 62d5ac3c988e..0dca8ff7557b 100644 --- a/tools/testing/nvdimm/Kbuild +++ b/tools/testing/nvdimm/Kbuild @@ -16,7 +16,7 @@ ldflags-y += --wrap=remove_resource DRIVERS := ../../../drivers NVDIMM_SRC := $(DRIVERS)/nvdimm -ACPI_SRC := $(DRIVERS)/acpi +ACPI_SRC := $(DRIVERS)/acpi/nfit DAX_SRC := $(DRIVERS)/dax ccflags-y := -I$(src)/$(NVDIMM_SRC)/ @@ -29,7 +29,7 @@ obj-$(CONFIG_ACPI_NFIT) += nfit.o obj-$(CONFIG_DEV_DAX) += dax.o obj-$(CONFIG_DEV_DAX_PMEM) += dax_pmem.o -nfit-y := $(ACPI_SRC)/nfit.o +nfit-y := $(ACPI_SRC)/core.o nfit-y += config_check.o nd_pmem-y := $(NVDIMM_SRC)/pmem.o diff --git a/tools/testing/nvdimm/test/Kbuild b/tools/testing/nvdimm/test/Kbuild index 9241064970fe..d32f25bba42a 100644 --- a/tools/testing/nvdimm/test/Kbuild +++ b/tools/testing/nvdimm/test/Kbuild @@ -1,5 +1,5 @@ ccflags-y := -I$(src)/../../../../drivers/nvdimm/ -ccflags-y += -I$(src)/../../../../drivers/acpi/ +ccflags-y += -I$(src)/../../../../drivers/acpi/nfit/ obj-m += nfit_test.o obj-m += nfit_test_iomap.o |