[ARM] Merge most of the PXA work for initial merge
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 14 Jul 2008 20:28:25 +0000 (21:28 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 14 Jul 2008 22:34:46 +0000 (23:34 +0100)
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

1  2 
arch/arm/Kconfig
arch/arm/configs/xm_x270_defconfig
arch/arm/mach-pxa/cm-x270.c
arch/arm/mach-pxa/em-x270.c
drivers/usb/gadget/Kconfig
drivers/usb/gadget/pxa27x_udc.c
drivers/video/pxafb.c
include/asm-arm/arch-pxa/pxa2xx-gpio.h

Simple merge
index 33b201c3b30900036550546aace1ade12d059c9f,7b3576e41e36247f187147e2d73cf29654e12513..aa40d91ce5994adf39b1656661cad922c5706bf7
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge