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-mvebu/coherency.c | |
| 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-mvebu/coherency.c')
| -rw-r--r-- | arch/arm/mach-mvebu/coherency.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c index be117591f7f2..4c24303ec481 100644 --- a/arch/arm/mach-mvebu/coherency.c +++ b/arch/arm/mach-mvebu/coherency.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <asm/cacheflush.h> | 28 | #include <asm/cacheflush.h> |
| 29 | #include "armada-370-xp.h" | 29 | #include "armada-370-xp.h" |
| 30 | 30 | ||
| 31 | unsigned long __cpuinitdata coherency_phys_base; | 31 | unsigned long coherency_phys_base; |
| 32 | static void __iomem *coherency_base; | 32 | static void __iomem *coherency_base; |
| 33 | static void __iomem *coherency_cpu_base; | 33 | static void __iomem *coherency_cpu_base; |
| 34 | 34 | ||