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 tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-pxa
/
tosa.c
diff --git
a/arch/arm/mach-pxa/tosa.c
b/arch/arm/mach-pxa/tosa.c
index 4f35b333de4495360845b434d98f23d388127f67..3d91d2e5bf3a6cf73fb800d49a7b7270a095a705 100644
(file)
--- a/
arch/arm/mach-pxa/tosa.c
+++ b/
arch/arm/mach-pxa/tosa.c
@@
-976,6
+976,6
@@
MACHINE_START(TOSA, "SHARP Tosa")
.init_irq = pxa25x_init_irq,
.handle_irq = pxa25x_handle_irq,
.init_machine = tosa_init,
- .
timer = &pxa_timer
,
+ .
init_time = pxa_timer_init
,
.restart = tosa_restart,
MACHINE_END