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 'master' into for-upstream
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
Makefile
diff --git
a/drivers/Makefile
b/drivers/Makefile
index 1a6930f9726a306b6cf392a87ef6bcb7b2c60e5b..cadc64fe8f68dc60ac5edf9e489b62ef913a4b5b 100644
(file)
--- a/
drivers/Makefile
+++ b/
drivers/Makefile
@@
-99,4
+99,5
@@
obj-$(CONFIG_OF) += of/
obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_VIRTIO) += virtio/
obj-$(CONFIG_REGULATOR) += regulator/
+obj-$(CONFIG_STAGING) += staging/
obj-$(CONFIG_UWB) += uwb/