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

[sfrench/cifs-2.6.git] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 07335e719bf835d7ad5e88a6b844f07210b4b6ba..3462245fe9fbf1e72ba496c81b76b754cd6f050a 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -679,6 +679,10 @@ source "fs/Kconfig"
 
 source "drivers/usb/Kconfig"
 
+source "drivers/uwb/Kconfig"
+
+source "drivers/staging/Kconfig"
+
 source "arch/cris/Kconfig.debug"
 
 source "security/Kconfig"