Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9722f8bb506cb9ad27f64b47ab15ce428886a0ba..72b45cdfea53a5635d9bcbad1b0a9e3734814afb 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1276,6 +1276,11 @@ source "drivers/regulator/Kconfig"
 
 source "drivers/uio/Kconfig"
 
+if ARCH_OMAP
+source "drivers/cbus/Kconfig"
+source "drivers/dsp/dspgateway/Kconfig"
+endif
+
 endmenu
 
 source "fs/Kconfig"