Merge branch 'master' into for-upstream

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

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 9b399a1bae8b95dba5a4b44fcbfc75a57973208a..d38f43f593d400e64ab7796c1f90760c66966caf 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -103,4 +103,6 @@ source "drivers/auxdisplay/Kconfig"
 source "drivers/uio/Kconfig"
 
 source "drivers/xen/Kconfig"
+
+source "drivers/staging/Kconfig"
 endmenu