linux/arch/arm/mach-omap1
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
ams-delta-fiq-handler.S
ams-delta-fiq.c
board-ams-delta.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
board-fsample.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-generic.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-h2-mmc.c
board-h2.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-h2.h
board-h3-mmc.c
board-h3.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-h3.h
board-htcherald.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-innovator.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-nand.c
board-nokia770.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-osk.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-palmte.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-palmtt.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-palmz71.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-perseus2.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sx1-mmc.c
board-sx1.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-voiceblue.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
clock_data.c
clock.c
clock.h
common.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
devices.c omap prcm changes via Paul Walmsley <paul@pwsan.com>: 2012-11-30 08:40:31 -08:00
dma.c ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h 2012-11-30 08:41:50 -08:00
dma.h
fb.c ARM: OMAP: Split fb.c to remove last remaining cpu_is_omap usage 2012-12-17 10:50:40 -08:00
flash.c
fpga.c
fpga.h
gpio7xx.c
gpio15xx.c
gpio16xx.c
i2c.c
id.c
io.c ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h 2012-11-30 08:41:50 -08:00
iomap.h
irq.c
Kconfig
lcd_dma.c ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h 2012-11-30 08:41:50 -08:00
mailbox.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
Makefile ARM: OMAP: Split fb.c to remove last remaining cpu_is_omap usage 2012-12-17 10:50:40 -08:00
Makefile.boot
mcbsp.c ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h 2012-11-30 08:41:50 -08:00
mmc.h
mux.c
ocpi.c
opp_data.c
opp.h
pm_bus.c
pm.c ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h 2012-11-30 08:41:50 -08:00
pm.h
reset.c
serial.c
sleep.S
soc.h
sram-init.c
sram.h
sram.S
time.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
timer32k.c ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
timer.c
usb.c ARM: OMAP1: fix USB configuration use-after-release 2013-01-03 11:31:40 -08:00