Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel

Conflicts:
	arch/arm/Kconfig
	arch/arm/kernel/smp.c
	arch/arm/mach-realview/Makefile
	arch/arm/mach-realview/platsmp.c

diff --cc arch/arm/Kconfig
index 430d2b7,ceb549c..c857111
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -849,10 -859,8 +849,11 @@@ source "kernel/time/Kconfig
  
  config SMP
        bool "Symmetric Multi-Processing (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP ||ARCH_OMAP4)
 -      depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX)
++      depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\
++               MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4)
 +      depends on GENERIC_CLOCKEVENTS
        select USE_GENERIC_SMP_HELPERS
 +      select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4)
        help
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If
@@@ -920,9 -916,8 +921,10 @@@ config HOTPLUG_CP
  
  config LOCAL_TIMERS
        bool "Use local timer interrupts"
-       depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP || ARCH_OMAP4)
 -      depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP || MACH_REALVIEW_PBX)
++      depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
++              REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4)
        default y
 +      select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4)
        help
          Enable support for local timers on SMP platforms, rather then the
          legacy IPI broadcast method.  Local timers allows the system

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/kernel/entry-armv.S
Simple merge

diff --cc arch/arm/kernel/smp.c
index 0d8097f,ece658e..de885fd
--- 1/arch/arm/kernel/smp.c
--- 2/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@@ -28,6 -26,6 +28,7 @@@
  #include <asm/atomic.h>
  #include <asm/cacheflush.h>
  #include <asm/cpu.h>
++#include <asm/cputype.h>
  #include <asm/mmu_context.h>
  #include <asm/pgtable.h>
  #include <asm/pgalloc.h>

diff --cc arch/arm/mach-realview/Kconfig
Simple merge

diff --cc arch/arm/mach-realview/Makefile
index e13d094,7df1931..e704edb
--- 1/arch/arm/mach-realview/Makefile
--- 2/arch/arm/mach-realview/Makefile
+++ b/arch/arm/mach-realview/Makefile
@@@ -7,6 -7,6 +7,7 @@@ obj-$(CONFIG_MACH_REALVIEW_EB)           += real
  obj-$(CONFIG_MACH_REALVIEW_PB11MP)    += realview_pb11mp.o
  obj-$(CONFIG_MACH_REALVIEW_PB1176)    += realview_pb1176.o
  obj-$(CONFIG_MACH_REALVIEW_PBA8)      += realview_pba8.o
 -obj-$(CONFIG_SMP)                     += platsmp.o headsmp.o localtimer.o
+ obj-$(CONFIG_MACH_REALVIEW_PBX)               += realview_pbx.o
 +obj-$(CONFIG_SMP)                     += platsmp.o headsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)             += hotplug.o
 +obj-$(CONFIG_LOCAL_TIMERS)            += localtimer.o

diff --cc arch/arm/mach-realview/platsmp.c
index ca74217,e3bd934..ac0e83f
--- 1/arch/arm/mach-realview/platsmp.c
--- 2/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@@ -23,7 -22,8 +23,8 @@@
  
  #include <mach/board-eb.h>
  #include <mach/board-pb11mp.h>
 -#include <mach/scu.h>
+ #include <mach/board-pbx.h>
 +#include <asm/smp_scu.h>
  
  #include "core.h"
  

diff --cc arch/arm/mm/Kconfig
Simple merge