Merge branch 'pxa' into devel
Russell King [Sun, 13 Jul 2008 11:05:49 +0000 (12:05 +0100)]
Conflicts:

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

1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/configs/xm_x270_defconfig
arch/arm/mm/Makefile
drivers/usb/gadget/Kconfig
drivers/video/pxafb.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -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
@@@ -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
Simple merge
Simple merge