These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / Makefile

diff --git a/kernel/drivers/Makefile b/kernel/drivers/Makefile
index 46d2554..795d0ca 100644 (file)
--- a/kernel/drivers/Makefile
+++ b/kernel/drivers/Makefile
@@ -11,7 +11,7 @@ obj-y                         += bus/
 obj-$(CONFIG_GENERIC_PHY)      += phy/
 
 # GPIO must come after pinctrl as gpios may need to mux pins etc
-obj-y                          += pinctrl/
+obj-$(CONFIG_PINCTRL)          += pinctrl/
 obj-y                          += gpio/
 obj-y                          += pwm/
 obj-$(CONFIG_PCI)              += pci/
@@ -63,12 +63,15 @@ obj-$(CONFIG_FB_I810)           += video/fbdev/i810/
 obj-$(CONFIG_FB_INTEL)          += video/fbdev/intelfb/
 
 obj-$(CONFIG_PARPORT)          += parport/
+obj-$(CONFIG_NVM)              += lightnvm/
 obj-y                          += base/ block/ misc/ mfd/ nfc/
+obj-$(CONFIG_LIBNVDIMM)                += nvdimm/
 obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
 obj-$(CONFIG_NUBUS)            += nubus/
 obj-y                          += macintosh/
 obj-$(CONFIG_IDE)              += ide/
 obj-$(CONFIG_SCSI)             += scsi/
+obj-y                          += nvme/
 obj-$(CONFIG_ATA)              += ata/
 obj-$(CONFIG_TARGET_CORE)      += target/
 obj-$(CONFIG_MTD)              += mtd/
@@ -98,7 +101,6 @@ obj-$(CONFIG_USB_GADGET)     += usb/
 obj-$(CONFIG_SERIO)            += input/serio/
 obj-$(CONFIG_GAMEPORT)         += input/gameport/
 obj-$(CONFIG_INPUT)            += input/
-obj-$(CONFIG_I2O)              += message/
 obj-$(CONFIG_RTC_LIB)          += rtc/
 obj-y                          += i2c/ media/
 obj-$(CONFIG_PPS)              += pps/
@@ -161,7 +163,12 @@ obj-$(CONFIG_NTB)          += ntb/
 obj-$(CONFIG_FMC)              += fmc/
 obj-$(CONFIG_POWERCAP)         += powercap/
 obj-$(CONFIG_MCB)              += mcb/
+obj-$(CONFIG_PERF_EVENTS)      += perf/
 obj-$(CONFIG_RAS)              += ras/
 obj-$(CONFIG_THUNDERBOLT)      += thunderbolt/
 obj-$(CONFIG_CORESIGHT)                += hwtracing/coresight/
+obj-y                          += hwtracing/intel_th/
+obj-$(CONFIG_STM)              += hwtracing/stm/
 obj-$(CONFIG_ANDROID)          += android/
+obj-$(CONFIG_NVMEM)            += nvmem/
+obj-$(CONFIG_FPGA)             += fpga/