xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'renesas/timer' into next/timer

Browse Source 
Conflicts:
	arch/arm/mach-shmobile/timer.c

This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2012-03-19 20:46:32 +00:00
parent c0206e228e 5cd9eb2736
commit b2f1df8d2f
627 changed files with 4503 additions and 2879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-shmobile/timer.c
View File

@@ -37,11 +37,15 @@ static void __init shmobile_late_time_init(void)
early_platform_driver_probe("earlytimer", 2, 0);
}
static void __init shmobile_timer_init(void)
void __init shmobile_earlytimer_init(void)
{
late_time_init = shmobile_late_time_init;
}
static void __init shmobile_timer_init(void)
{
}
void __init shmobile_twd_init(struct twd_local_timer *twd_local_timer)
{
#ifdef CONFIG_HAVE_ARM_TWD