From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 13 Jul 2008 11:05:49 +0000 (+0100)
Subject: Merge branch 'pxa' into devel
X-Git-Tag: v2.6.27-rc1~850^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=044e5f45e4ad890d03bd1e8bb44c634397cac24d;p=linux-2.6-omap-h63xx.git

Merge branch 'pxa' into devel

Conflicts:

	arch/arm/configs/em_x270_defconfig
	arch/arm/configs/xm_x270_defconfig
---

044e5f45e4ad890d03bd1e8bb44c634397cac24d
diff --cc arch/arm/configs/xm_x270_defconfig
index 33b201c3b30,7b3576e41e3..aa40d91ce59
--- a/arch/arm/configs/xm_x270_defconfig
+++ b/arch/arm/configs/xm_x270_defconfig
@@@ -192,10 -249,15 +249,14 @@@ CONFIG_PCCARD_NONSTATIC=
  #
  # Kernel Features
  #
- # CONFIG_TICK_ONESHOT is not set
+ CONFIG_TICK_ONESHOT=y
+ CONFIG_NO_HZ=y
 -# CONFIG_NO_IDLE_HZ is not set
+ # CONFIG_HIGH_RES_TIMERS is not set
+ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
  # CONFIG_PREEMPT is not set
  CONFIG_HZ=100
- # CONFIG_AEABI is not set
+ CONFIG_AEABI=y
+ CONFIG_OABI_COMPAT=y
  # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
  CONFIG_SELECT_MEMORY_MODEL=y
  CONFIG_FLATMEM_MANUAL=y
diff --cc arch/arm/mm/Makefile
index f64b92557b1,e7c14e39938..2e27a8c8372
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
@@@ -74,5 -73,6 +74,7 @@@ obj-$(CONFIG_CPU_FEROCEON)	+= proc-fero
  obj-$(CONFIG_CPU_V6)		+= proc-v6.o
  obj-$(CONFIG_CPU_V7)		+= proc-v7.o
  
 +obj-$(CONFIG_CACHE_FEROCEON_L2)	+= cache-feroceon-l2.o
  obj-$(CONFIG_CACHE_L2X0)	+= cache-l2x0.o
+ obj-$(CONFIG_CACHE_XSC3L2)	+= cache-xsc3l2.o
+