git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
[pandora-kernel.git]
/
arch
/
arm
/
mach-prima2
/
l2x0.c
diff --git
a/arch/arm/mach-prima2/l2x0.c
b/arch/arm/mach-prima2/l2x0.c
index
9cda205
..
66c6387
100644
(file)
--- a/
arch/arm/mach-prima2/l2x0.c
+++ b/
arch/arm/mach-prima2/l2x0.c
@@
-13,7
+13,6
@@
#include <linux/of.h>
#include <linux/of_address.h>
#include <asm/hardware/cache-l2x0.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <asm/hardware/cache-l2x0.h>
-#include <mach/memory.h>
#define L2X0_ADDR_FILTERING_START 0xC00
#define L2X0_ADDR_FILTERING_END 0xC04
#define L2X0_ADDR_FILTERING_START 0xC00
#define L2X0_ADDR_FILTERING_END 0xC04
@@
-41,9
+40,9
@@
static int __init sirfsoc_of_l2x_init(void)
/*
* set the physical memory windows L2 cache will cover
*/
/*
* set the physical memory windows L2 cache will cover
*/
- writel_relaxed(P
LAT_P
HYS_OFFSET + 1024 * 1024 * 1024,
+ writel_relaxed(PHYS_OFFSET + 1024 * 1024 * 1024,
sirfsoc_l2x_base + L2X0_ADDR_FILTERING_END);
sirfsoc_l2x_base + L2X0_ADDR_FILTERING_END);
- writel_relaxed(P
LAT_P
HYS_OFFSET | 0x1,
+ writel_relaxed(PHYS_OFFSET | 0x1,
sirfsoc_l2x_base + L2X0_ADDR_FILTERING_START);
writel_relaxed(0,
sirfsoc_l2x_base + L2X0_ADDR_FILTERING_START);
writel_relaxed(0,