projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
09fa31a
)
ARM: l2x0: add empty l2x0_of_init
author
Rob Herring
<
[email protected]
>
Thu, 25 Aug 2011 13:14:52 +0000
(08:14 -0500)
committer
Arnd Bergmann
<
[email protected]
>
Mon, 31 Oct 2011 13:13:57 +0000
(14:13 +0100)
Add empty version of l2x0_of_init for when CONFIG_CACHE_L2X0 is not selected.
Signed-off-by: Rob Herring <
[email protected]
>
Acked-by: Barry Song <
[email protected]
>
Reviewed-by: Shawn Guo <
[email protected]
>
arch/arm/include/asm/hardware/cache-l2x0.h
patch
|
blob
|
history
diff --git
a/arch/arm/include/asm/hardware/cache-l2x0.h
b/arch/arm/include/asm/hardware/cache-l2x0.h
index 434edccdf7f3b15b1badc64e2a6334b9855b472f..1db1143a94838cb92419040c40009f17d1ee2f97 100644
(file)
--- a/
arch/arm/include/asm/hardware/cache-l2x0.h
+++ b/
arch/arm/include/asm/hardware/cache-l2x0.h
@@
-102,7
+102,14
@@
#ifndef __ASSEMBLY__
extern void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask);
+#if defined(CONFIG_CACHE_L2X0) && defined(CONFIG_OF)
extern int l2x0_of_init(__u32 aux_val, __u32 aux_mask);
+#else
+static inline int l2x0_of_init(__u32 aux_val, __u32 aux_mask)
+{
+ return -ENODEV;
+}
+#endif
struct l2x0_regs {
unsigned long phy_base;
@@
-121,6
+128,6
@@
struct l2x0_regs {
extern struct l2x0_regs l2x0_saved_regs;
-#endif
+#endif
/* __ASSEMBLY__ */
#endif