Merge branch 'linus' into irq/numa

[sfrench/cifs-2.6.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e60ec54df334fd5bcf072a225a1e8b95e046b63e..9d02cdb15b23dc6d4524cf61db4153c810639580 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -273,6 +273,7 @@ config ARCH_EP93XX
        select HAVE_CLK
        select COMMON_CLKDEV
        select ARCH_REQUIRE_GPIOLIB
        select HAVE_CLK
        select COMMON_CLKDEV
        select ARCH_REQUIRE_GPIOLIB

+       select ARCH_HAS_HOLES_MEMORYMODEL

        help
          This enables support for the Cirrus EP93xx series of CPUs.
 
        help
          This enables support for the Cirrus EP93xx series of CPUs.
 


@@ -976,10 +977,9 @@ 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
+config ARCH_HAS_HOLES_MEMORYMODEL

        bool
        bool

-       default y
-       depends on FLATMEM
+       default n

 
 # Discontigmem is deprecated
 config ARCH_DISCONTIGMEM_ENABLE
 
 # Discontigmem is deprecated
 config ARCH_DISCONTIGMEM_ENABLE