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 branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-s3c64xx
/
mach-hmt.c
diff --git
a/arch/arm/mach-s3c64xx/mach-hmt.c
b/arch/arm/mach-s3c64xx/mach-hmt.c
index 2b144893ddc4ca337e98356608d82ca102ba508d..7212eb9cfeb9f255f5581b485a2f34eb4afd0261 100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-hmt.c
+++ b/
arch/arm/mach-s3c64xx/mach-hmt.c
@@
-30,7
+30,6
@@
#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/hardware.h>
#include <mach/map.h>
-#include <asm/hardware/vic.h>
#include <asm/irq.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
#include <asm/mach-types.h>
@@
-273,10
+272,9
@@
MACHINE_START(HMT, "Airgoo-HMT")
/* Maintainer: Peter Korsgaard <jacmet@sunsite.dk> */
.atag_offset = 0x100,
.init_irq = s3c6410_init_irq,
/* Maintainer: Peter Korsgaard <jacmet@sunsite.dk> */
.atag_offset = 0x100,
.init_irq = s3c6410_init_irq,
- .handle_irq = vic_handle_irq,
.map_io = hmt_map_io,
.init_machine = hmt_machine_init,
.init_late = s3c64xx_init_late,
.map_io = hmt_map_io,
.init_machine = hmt_machine_init,
.init_late = s3c64xx_init_late,
- .
timer = &s3c24xx_timer
,
+ .
init_time = s3c24xx_timer_init
,
.restart = s3c64xx_restart,
MACHINE_END
.restart = s3c64xx_restart,
MACHINE_END