Merge tag 'armsoc-tee' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

diff --git a/drivers/Makefile b/drivers/Makefile
index 5db9aa6beeafd938f385de260552d56af319a81a..cfabd141dba2ad3a6208f3c880f5cc7a14eecc3e 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/
@@ -104,6 +106,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/