Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6

[~andy/linux] / drivers / Kconfig

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 177c7d15693309fe6d00a6a51db79cb25d26cf5b..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"
@@ -119,4 +121,7 @@ source "drivers/platform/Kconfig"
 source "drivers/clk/Kconfig"
 
 source "drivers/hwspinlock/Kconfig"
+
+source "drivers/clocksource/Kconfig"
+
 endmenu