torvalds-linux/arch/arm/mach-s3c24xx
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
bast-ide.c
bast-irq.c
clock-s3c244x.c
clock-s3c2412.c
clock-s3c2416.c
clock-s3c2440.c
clock-s3c2443.c
common-s3c2443.c
common-smdk.c
common.c
common.h
dma-s3c2410.c
dma-s3c2412.c
dma-s3c2440.c
dma-s3c2443.c
h1940-bluetooth.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
irq-pm.c
irq-s3c244x.c
irq-s3c2412.c
irq-s3c2416.c
irq-s3c2440.c
irq-s3c2443.c
Kconfig ARM: arm-soc: SoC updates for 3.8 2012-12-12 12:05:15 -08:00
mach-amlm5900.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-anubis.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-at2440evb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-bast.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-gta02.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-h1940.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-jive.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mini2440.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-n30.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-nexcoder.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-osiris-dvs.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
mach-osiris.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-otom.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-qt2410.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-rx1950.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-rx3715.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-smdk2410.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-smdk2413.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-smdk2416.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-smdk2440.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-smdk2443.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-tct_hammer.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-vr1000.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-vstms.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
Makefile
Makefile.boot
pm-h1940.S
pm-s3c2410.c
pm-s3c2412.c
pm-s3c2416.c
pm.c
s3c244x.c
s3c2410.c
s3c2412.c
s3c2416.c
s3c2440.c
s3c2442.c
s3c2443.c
setup-i2c.c
setup-sdhci-gpio.c
setup-spi.c
setup-ts.c
simtec-audio.c
simtec-nor.c
simtec-pm.c
simtec-usb.c
simtec.h
sleep-s3c2410.S
sleep-s3c2412.S
sleep.S