projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
Makefile
diff --git
a/drivers/Makefile
b/drivers/Makefile
index 09f3232bcdcddd2ff2ce042cd0a7a977320356c4..939fcdeb2d31a02f77ec7b5cecbd4cb0921da370 100644
(file)
--- a/
drivers/Makefile
+++ b/
drivers/Makefile
@@
-122,3
+122,5
@@
obj-y += ieee802154/
obj-y += clk/
obj-$(CONFIG_HWSPINLOCK) += hwspinlock/
+obj-$(CONFIG_NFC) += nfc/
+obj-$(CONFIG_IOMMU_SUPPORT) += iommu/