Merge tag 'for-linus-4.12b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/Makefile b/drivers/Makefile
index 8f8bdc9..cfabd14 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -14,7 +14,9 @@ obj-$(CONFIG_GENERIC_PHY)     += phy/
 obj-$(CONFIG_PINCTRL)          += pinctrl/
 obj-$(CONFIG_GPIOLIB)          += gpio/
 obj-y                          += pwm/
+
 obj-$(CONFIG_PCI)              += pci/
+obj-$(CONFIG_PCI_ENDPOINT)     += pci/endpoint/
 # PCI dwc controller drivers
 obj-y                          += pci/dwc/
 
@@ -71,7 +73,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/
@@ -178,3 +180,4 @@ obj-$(CONFIG_ANDROID)               += android/
 obj-$(CONFIG_NVMEM)            += nvmem/
 obj-$(CONFIG_FPGA)             += fpga/
 obj-$(CONFIG_FSI)              += fsi/
+obj-$(CONFIG_TEE)              += tee/