projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-5.12-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
[linux-2.6-block.git]
/
drivers
/
Makefile
diff --git
a/drivers/Makefile
b/drivers/Makefile
index b2af1514a6b367ddab33ddf2a17d16b9cc3efdf0..6fba7daba59194dcc785d05f64e3c0296db9a2b7 100644
(file)
--- a/
drivers/Makefile
+++ b/
drivers/Makefile
@@
-73,6
+73,7
@@
obj-$(CONFIG_NVM) += lightnvm/
obj-y += base/ block/ misc/ mfd/ nfc/
obj-$(CONFIG_LIBNVDIMM) += nvdimm/
obj-$(CONFIG_DAX) += dax/
+obj-$(CONFIG_CXL_BUS) += cxl/
obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
obj-$(CONFIG_NUBUS) += nubus/
obj-y += macintosh/