Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/asm-x86/statfs.h

1 files changed, 58 insertions, 16 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2f7ef54ef3ae..4853f9df37bd 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -146,7 +146,6 @@ config ARCH_MAY_HAVE_PC_FDC
 
 config ZONE_DMA
         bool
-        default y
 
 config GENERIC_ISA_DMA
         bool
@@ -176,6 +175,11 @@ config OPROFILE_MPCORE
 config OPROFILE_ARM11_CORE
         bool
 
+config OPROFILE_ARMV7
+        def_bool y
+        depends on CPU_V7 && !SMP
+        bool
+
 endif
 
 config VECTORS_BASE
@@ -243,6 +247,7 @@ config ARCH_CLPS7500
         select TIMER_ACORN
         select ISA
         select NO_IOPORT
+        select ARCH_SPARSEMEM_ENABLE
         help
           Support for the Cirrus Logic PS7500FE system-on-a-chip.
 
@@ -304,6 +309,7 @@ config ARCH_IOP13XX
         select PLAT_IOP
         select PCI
         select ARCH_SUPPORTS_MSI
+        select VMSPLIT_1G
         help
           Support for Intel's IOP13XX (XScale) family of processors.
 
@@ -348,6 +354,7 @@ config ARCH_IXP4XX
         select GENERIC_GPIO
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
+        select ZONE_DMA if PCI
         help
           Support for Intel's IXP4XX (XScale) family of processors.
 
@@ -432,7 +439,7 @@ config ARCH_ORION5X
         help
           Support for the following Marvell Orion 5x series SoCs:
           Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
-          Orion-2 (5281).
+          Orion-2 (5281), Orion-1-90 (6183).
 
 config ARCH_PNX4008
         bool "Philips Nexperia PNX4008 Mobile"
@@ -462,6 +469,7 @@ config ARCH_RPC
         select HAVE_PATA_PLATFORM
         select ISA_DMA_API
         select NO_IOPORT
+        select ARCH_SPARSEMEM_ENABLE
         help
           On the Acorn Risc-PC, Linux can support the internal IDE disk and
           CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -469,9 +477,7 @@ config ARCH_RPC
 config ARCH_SA1100
         bool "SA1100-based"
         select ISA
-        select ARCH_DISCONTIGMEM_ENABLE
         select ARCH_SPARSEMEM_ENABLE
-        select ARCH_SELECT_MEMORY_MODEL
         select ARCH_MTD_XIP
         select GENERIC_GPIO
         select GENERIC_TIME
@@ -495,6 +501,7 @@ config ARCH_SHARK
         bool "Shark"
         select ISA
         select ISA_DMA
+        select ZONE_DMA
         select PCI
         help
           Support for the StrongARM based Digital DNARD machine, also known
@@ -502,6 +509,8 @@ config ARCH_SHARK
 
 config ARCH_LH7A40X
         bool "Sharp LH7A40X"
+        select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM
+        select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM
         help
           Say Y here for systems based on one of the Sharp LH7A40X
           System on a Chip processors.  These CPUs include an ARM922T
@@ -513,7 +522,9 @@ config ARCH_DAVINCI
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
         select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
         select HAVE_CLK
+        select ZONE_DMA
         help
           Support for TI's DaVinci platform.
 
@@ -732,6 +743,29 @@ config SMP
 
           If you don't know what to do here, say N.
 
+choice
+        prompt "Memory split"
+        default VMSPLIT_3G
+        help
+          Select the desired split between kernel and user memory.
+
+          If you are not absolutely sure what you are doing, leave this
+          option alone!
+
+        config VMSPLIT_3G
+                bool "3G/1G user/kernel split"
+        config VMSPLIT_2G
+                bool "2G/2G user/kernel split"
+        config VMSPLIT_1G
+                bool "1G/3G user/kernel split"
+endchoice
+
+config PAGE_OFFSET
+        hex
+        default 0x40000000 if VMSPLIT_1G
+        default 0x80000000 if VMSPLIT_2G
+        default 0xC0000000
+
 config NR_CPUS
         int "Maximum number of CPUs (2-32)"
         range 2 32
@@ -813,20 +847,18 @@ config ARCH_FLATMEM_HAS_HOLES
         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
 
+config ARCH_SPARSEMEM_DEFAULT
+        def_bool ARCH_SPARSEMEM_ENABLE
+
 config ARCH_SELECT_MEMORY_MODEL
-        bool
+        def_bool ARCH_DISCONTIGMEM_ENABLE && ARCH_SPARSEMEM_ENABLE
 
 config NODES_SHIFT
         int
@@ -843,7 +875,7 @@ config LEDS
                    ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                    ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                    ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
-                   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \
+                   ARCH_AT91 || ARCH_DAVINCI || \
                    ARCH_KS8695 || MACH_RD88F5182
         help
           If you say Y here, the LEDs on your machine will be used
@@ -1003,9 +1035,9 @@ config ATAGS_PROC
 
 endmenu
 
-if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
+menu "CPU Power Management"
 
-menu "CPU Frequency scaling"
+if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
 
 source "drivers/cpufreq/Kconfig"
 
@@ -1045,10 +1077,12 @@ config CPU_FREQ_PXA
         default y
         select CPU_FREQ_DEFAULT_GOV_USERSPACE
 
-endmenu
-
 endif
 
+source "drivers/cpuidle/Kconfig"
+
+endmenu
+
 menu "Floating point emulation"
 
 comment "At least one emulation must be selected"
@@ -1200,6 +1234,8 @@ source "drivers/power/Kconfig"
 
 source "drivers/hwmon/Kconfig"
 
+source "drivers/thermal/Kconfig"
+
 source "drivers/watchdog/Kconfig"
 
 source "drivers/ssb/Kconfig"
@@ -1220,6 +1256,10 @@ source "drivers/usb/Kconfig"
 
 source "drivers/mmc/Kconfig"
 
+source "drivers/memstick/Kconfig"
+
+source "drivers/accessibility/Kconfig"
+
 source "drivers/leds/Kconfig"
 
 source "drivers/rtc/Kconfig"
@@ -1228,6 +1268,8 @@ source "drivers/dma/Kconfig"
 
 source "drivers/dca/Kconfig"
 
+source "drivers/auxdisplay/Kconfig"
+
 source "drivers/regulator/Kconfig"
 
 source "drivers/uio/Kconfig"