Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 2735bde..cadc64f 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -99,3 +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/