diff options
author | Olof Johansson | 2013-01-14 19:20:02 +0100 |
---|---|---|
committer | Olof Johansson | 2013-01-14 19:20:02 +0100 |
commit | 8d84981e395850aab31c3f2ca7e2738e03f671d7 (patch) | |
tree | 933425fddb23d28be802277471df3fe3f6c2711d /arch/sparc/kernel/time_32.c | |
parent | Merge branch 'timer/cleanup' into next/cleanup (diff) | |
parent | clocksource: use clockevents_config_and_register() where possible (diff) | |
download | kernel-qcow2-linux-8d84981e395850aab31c3f2ca7e2738e03f671d7.tar.gz kernel-qcow2-linux-8d84981e395850aab31c3f2ca7e2738e03f671d7.tar.xz kernel-qcow2-linux-8d84981e395850aab31c3f2ca7e2738e03f671d7.zip |
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
Diffstat (limited to 'arch/sparc/kernel/time_32.c')
-rw-r--r-- | arch/sparc/kernel/time_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/time_32.c b/arch/sparc/kernel/time_32.c index 953641549e82..c4c27b0f9063 100644 --- a/arch/sparc/kernel/time_32.c +++ b/arch/sparc/kernel/time_32.c @@ -278,7 +278,7 @@ static struct platform_device m48t59_rtc = { }, }; -static int __devinit clock_probe(struct platform_device *op) +static int clock_probe(struct platform_device *op) { struct device_node *dp = op->dev.of_node; const char *model = of_get_property(dp, "model", NULL); |