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 4b8acd2851f48e4a7e42bd6f8886fae30aae930c..aa475d93549a1f3a07bb8ee61dffc24e40e762e8 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -810,6 +810,11 @@ config OABI_COMPAT
          UNPREDICTABLE (in fact it can be predicted that it won't work
          at all). If in doubt say Y.
 
          UNPREDICTABLE (in fact it can be predicted that it won't work
          at all). If in doubt say Y.
 

+config ARCH_FLATMEM_HAS_HOLES
+       bool
+       default y
+       depends on FLATMEM
+

 config ARCH_DISCONTIGMEM_ENABLE
        bool
        default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
 config ARCH_DISCONTIGMEM_ENABLE
        bool
        default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)


@@ -1229,6 +1234,11 @@ source "drivers/regulator/Kconfig"
 
 source "drivers/uio/Kconfig"
 
 
 source "drivers/uio/Kconfig"
 

+if ARCH_OMAP
+source "drivers/cbus/Kconfig"
+source "drivers/dsp/dspgateway/Kconfig"
+endif
+

 endmenu
 
 source "fs/Kconfig"
 endmenu
 
 source "fs/Kconfig"