Merge tag 'libnvdimm-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim...

[karo-tx-linux.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 2eced9afba5323ac16fa0f6a9a4459450f9f1fab..903b19199b695410d7dff701a97c56d056bc839a 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -71,7 +71,7 @@ obj-$(CONFIG_PARPORT)         += parport/
 obj-$(CONFIG_NVM)              += lightnvm/
 obj-y                          += base/ block/ misc/ mfd/ nfc/
 obj-$(CONFIG_LIBNVDIMM)                += nvdimm/
-obj-$(CONFIG_DEV_DAX)          += dax/
+obj-$(CONFIG_DAX)              += dax/
 obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
 obj-$(CONFIG_NUBUS)            += nubus/
 obj-y                          += macintosh/
@@ -104,6 +104,7 @@ obj-$(CONFIG_USB_PHY)               += usb/
 obj-$(CONFIG_USB)              += usb/
 obj-$(CONFIG_PCI)              += usb/
 obj-$(CONFIG_USB_GADGET)       += usb/
+obj-$(CONFIG_OF)               += usb/
 obj-$(CONFIG_SERIO)            += input/serio/
 obj-$(CONFIG_GAMEPORT)         += input/gameport/
 obj-$(CONFIG_INPUT)            += input/