Merge branch 'ptebits' into devel
Russell King [Thu, 9 Oct 2008 20:31:56 +0000 (21:31 +0100)]
Conflicts:

arch/arm/Kconfig

16 files changed:
1  2 
arch/arm/Kconfig
arch/arm/include/asm/pgtable.h
arch/arm/lib/sha1.S
arch/arm/mach-footbridge/time.c
arch/arm/mach-ixp2000/enp2611.c
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/spitz.c
arch/arm/mm/fault-armv.c
arch/arm/mm/ioremap.c
arch/arm/mm/mm.h
arch/arm/mm/mmu.c
arch/arm/mm/proc-v7.S
arch/arm/plat-omap/gpio.c
drivers/net/Kconfig
drivers/net/smc91x.c

@@@ -843,9 -810,19 +843,14 @@@ config OABI_COMPA
          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
 +# Discontigmem is deprecated
  config ARCH_DISCONTIGMEM_ENABLE
        bool
 -      default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
 -      help
 -        Say Y to support efficient handling of discontiguous physical memory,
 -        for architectures which are either NUMA (Non-Uniform Memory Access)
 -        or have huge holes in the physical address space for other reasons.
 -        See <file:Documentation/vm/numa> for more.
  
  config ARCH_SPARSEMEM_ENABLE
        bool
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge