Merge tag 'kbuild-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[sfrench/cifs-2.6.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index cf5d8b86da8f0b4c014ad7d8c897ef7c944f1148..20b118dca999fad5f9e78232c747f50e0da6386a 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -6,6 +6,11 @@
 # Rewritten to use lists instead of if-statements.
 #
 
+# Some driver Makefiles miss $(srctree)/ for include directive.
+ifdef building_out_of_srctree
+MAKEFLAGS += --include-dir=$(srctree)
+endif
+
 obj-y                          += irqchip/
 obj-y                          += bus/
 
@@ -71,7 +76,7 @@ obj-$(CONFIG_FB_INTEL)          += video/fbdev/intelfb/
 obj-$(CONFIG_PARPORT)          += parport/
 obj-y                          += base/ block/ misc/ mfd/ nfc/
 obj-$(CONFIG_LIBNVDIMM)                += nvdimm/
-obj-$(CONFIG_DAX)              += dax/
+obj-y                          += dax/
 obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
 obj-$(CONFIG_NUBUS)            += nubus/
 obj-y                          += cxl/
@@ -98,7 +103,6 @@ obj-$(CONFIG_DIO)            += dio/
 obj-$(CONFIG_SBUS)             += sbus/
 obj-$(CONFIG_ZORRO)            += zorro/
 obj-$(CONFIG_ATA_OVER_ETH)     += block/aoe/
-obj-$(CONFIG_PARIDE)           += block/paride/
 obj-$(CONFIG_TC)               += tc/
 obj-$(CONFIG_USB_PHY)          += usb/
 obj-$(CONFIG_USB)              += usb/
@@ -189,3 +193,4 @@ obj-$(CONFIG_COUNTER)               += counter/
 obj-$(CONFIG_MOST)             += most/
 obj-$(CONFIG_PECI)             += peci/
 obj-$(CONFIG_HTE)              += hte/
+obj-$(CONFIG_DRM_ACCEL)                += accel/