linux/arch/arm/mach-w90x900
Olof Johansson 8d84981e39 Merge branch 'clocksource/cleanup' into next/cleanup
Clockevent cleanup series from Shawn Guo.

Resolved move/change conflict in mach-pxa/time.c due to the sys_timer
cleanup.

* clocksource/cleanup:
  clocksource: use clockevents_config_and_register() where possible
  ARM: use clockevents_config_and_register() where possible
  clockevents: export clockevents_config_and_register for module use
  + sync to Linux 3.8-rc3

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/mach-pxa/time.c
2013-01-14 10:20:02 -08:00
..
include/mach ARM: w90x900: move platform_data definitions 2012-09-14 11:18:59 +02:00
clksel.c ARM: 7274/1: NUC900: Rename nuc900-audio platform device to nuc900-ac97 2012-01-13 08:56:40 +00:00
clock.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
clock.h ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
cpu.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
cpu.h NUC900 LCD Controller Driver 2010-03-12 15:52:34 -08:00
dev.c ARM: w90x900: move platform_data definitions 2012-09-14 11:18:59 +02:00
gpio.c ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform 2009-09-02 11:22:23 +01:00
irq.c Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
Kconfig ARM: 5684/1: Add nuc960 platform to w90x900 2009-09-02 11:22:24 +01:00
mach-nuc910evb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-nuc950evb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-nuc960evb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
Makefile ARM: 5684/1: Add nuc960 platform to w90x900 2009-09-02 11:22:24 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mfp.c ARM: 7274/1: NUC900: Rename nuc900-audio platform device to nuc900-ac97 2012-01-13 08:56:40 +00:00
nuc9xx.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
nuc910.c ARM: 6249/1: add nuc900 kpi platform_device structure to nuc910_dev 2010-07-22 09:20:17 +01:00
nuc910.h ARM: w90x900: add common nuc9xx.h 2011-11-21 09:49:30 +00:00
nuc950.c ARM: 6231/1: re-organize the nuc900 lcd arch platform data setting 2010-07-22 09:20:16 +01:00
nuc950.h ARM: w90x900: add common nuc9xx.h 2011-11-21 09:49:30 +00:00
nuc960.c ARM: 5684/1: Add nuc960 platform to w90x900 2009-09-02 11:22:24 +01:00
nuc960.h ARM: w90x900: add common nuc9xx.h 2011-11-21 09:49:30 +00:00
time.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00