Merge branch 'master' into for-upstream

[cascardo/linux.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 1a6930f..cadc64f 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/