From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 14 Jul 2008 20:28:25 +0000 (+0100)
Subject: [ARM] Merge most of the PXA work for initial merge
X-Git-Tag: v2.6.27-rc1~1095^2
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=53ffe3b440aa85af6fc4eda09b2d44bcdd312d4d;p=linux-2.6-omap-h63xx.git

[ARM] Merge most of the PXA work for initial merge

This includes PXA work up to the SPI changes for the initial merge,
since e172274ccc55d20536fbdceb6131f38e288541e0 depends on the SPI
tree being merged.

Conflicts:

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

53ffe3b440aa85af6fc4eda09b2d44bcdd312d4d
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