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 'nfsd-4.4' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-bcm
/
platsmp-brcmstb.c
diff --git
a/arch/arm/mach-bcm/platsmp-brcmstb.c
b/arch/arm/mach-bcm/platsmp-brcmstb.c
index e209e6fc7cafa553fa56ec5f0f2b845d447a0ff7..44d6bddf7a4e788044da329ce79f4a66ae6b07ed 100644
(file)
--- a/
arch/arm/mach-bcm/platsmp-brcmstb.c
+++ b/
arch/arm/mach-bcm/platsmp-brcmstb.c
@@
-30,8
+30,6
@@
#include <asm/mach-types.h>
#include <asm/smp_plat.h>
#include <asm/mach-types.h>
#include <asm/smp_plat.h>
-#include "brcmstb.h"
-
enum {
ZONE_MAN_CLKEN_MASK = BIT(0),
ZONE_MAN_RESET_CNTL_MASK = BIT(1),
enum {
ZONE_MAN_CLKEN_MASK = BIT(0),
ZONE_MAN_RESET_CNTL_MASK = BIT(1),
@@
-153,7
+151,7
@@
static void brcmstb_cpu_boot(u32 cpu)
* Set the reset vector to point to the secondary_startup
* routine
*/
* Set the reset vector to point to the secondary_startup
* routine
*/
- cpu_set_boot_addr(cpu, virt_to_phys(
brcmstb_
secondary_startup));
+ cpu_set_boot_addr(cpu, virt_to_phys(secondary_startup));
/* Unhalt the cpu */
cpu_rst_cfg_set(cpu, 0);
/* Unhalt the cpu */
cpu_rst_cfg_set(cpu, 0);