someOS/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'clocksource/cleanup' into next/cleanup

Browse Source 
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
This commit is contained in:
Olof Johansson
2013-01-14 10:20:02 -08:00
parent 00c82d6440 77cc982f6a
commit 8d84981e39
1434 changed files with 8056 additions and 8080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/time/clockevents.c
View File

@@ -339,6 +339,7 @@ void clockevents_config_and_register(struct clock_event_device *dev,
clockevents_config(dev, freq);
clockevents_register_device(dev);
}
EXPORT_SYMBOL_GPL(clockevents_config_and_register);
/**
* clockevents_update_freq - Update frequency and reprogram a clock event device.