Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6-omap-h63xx.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index f443a8a9d46e547ddce0ca5dc114899f737066d5..2503f7b99b2fdc70edf3648d365c7a2c35e85eaa 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -100,3 +100,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/