Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[~andy/linux] / arch / h8300 / Kconfig

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index bd1995403c67d0f9b37b34674a6c80ab7ee2a76b..9420648352b8bc7783594c2177e14da2443aaf45 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -216,8 +216,12 @@ source "drivers/hwmon/Kconfig"
 
 source "drivers/usb/Kconfig"
 
+source "drivers/uwb/Kconfig"
+
 endmenu
 
+source "drivers/staging/Kconfig"
+
 source "fs/Kconfig"
 
 source "arch/h8300/Kconfig.debug"