Merge branch 'next' into for-linus

[~andy/linux] / drivers / Kconfig

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 557a469c7aa61bbd7905d0805521dc4cb38b5bcf..61631edfecc208d611d1d93b6f069e440e2223bc 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -68,6 +68,8 @@ source "drivers/watchdog/Kconfig"
 
 source "drivers/ssb/Kconfig"
 
+source "drivers/bcma/Kconfig"
+
 source "drivers/mfd/Kconfig"
 
 source "drivers/regulator/Kconfig"