Merge branch 'linus' into test

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

diff --git a/drivers/Makefile b/drivers/Makefile
index f443a8a9d46e547ddce0ca5dc114899f737066d5..a0a2e3b675d6e1a1b1df241bfb5980b9b2d570b2 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -100,3 +100,4 @@ obj-$(CONFIG_OF)            += of/
 obj-$(CONFIG_SSB)              += ssb/
 obj-$(CONFIG_VIRTIO)           += virtio/
 obj-$(CONFIG_REGULATOR)                += regulator/
+obj-$(CONFIG_STAGING)          += staging/