diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
| commit | eeca9fad52fc4bfdf42c38bfcf383e932eb3e9d6 (patch) | |
| tree | cc51c880459d41c0e8d7576405bef4c987bc7aa0 /arch/arm/mach-zynq/common.h | |
| parent | ff6f83fc9d44db09997937c3475d525a6866fbb4 (diff) | |
| parent | b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge upstream tree in order to reinstate crct10dif.
Diffstat (limited to 'arch/arm/mach-zynq/common.h')
| -rw-r--r-- | arch/arm/mach-zynq/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-zynq/common.h b/arch/arm/mach-zynq/common.h index fbbd0e21c404..3040d219570f 100644 --- a/arch/arm/mach-zynq/common.h +++ b/arch/arm/mach-zynq/common.h | |||
| @@ -27,7 +27,7 @@ extern void secondary_startup(void); | |||
| 27 | extern char zynq_secondary_trampoline; | 27 | extern char zynq_secondary_trampoline; |
| 28 | extern char zynq_secondary_trampoline_jump; | 28 | extern char zynq_secondary_trampoline_jump; |
| 29 | extern char zynq_secondary_trampoline_end; | 29 | extern char zynq_secondary_trampoline_end; |
| 30 | extern int __cpuinit zynq_cpun_start(u32 address, int cpu); | 30 | extern int zynq_cpun_start(u32 address, int cpu); |
| 31 | extern struct smp_operations zynq_smp_ops __initdata; | 31 | extern struct smp_operations zynq_smp_ops __initdata; |
| 32 | #endif | 32 | #endif |
| 33 | 33 | ||