projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-sa1100
/
shannon.c
diff --git
a/arch/arm/mach-sa1100/shannon.c
b/arch/arm/mach-sa1100/shannon.c
index 6460d25fbb88cd2fc47dc7c35d0f4f45e81c610b..c8866bce738644217d74affbd8eb191aa50d5bcf 100644
(file)
--- a/
arch/arm/mach-sa1100/shannon.c
+++ b/
arch/arm/mach-sa1100/shannon.c
@@
-102,7
+102,7
@@
MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
.map_io = shannon_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = sa1100_init_irq,
- .
timer = &sa1100_timer
,
+ .
init_time = sa1100_timer_init
,
.init_machine = shannon_init,
.init_late = sa11x0_init_late,
.restart = sa11x0_restart,