diff options
author | Rob Herring <rob.herring@calxeda.com> | 2011-08-25 09:14:52 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:13:57 -0400 |
commit | fae2b89ab13f6181cb418d788b66a44758cc71d4 (patch) | |
tree | 0cc0474c73eb3020cbe323a0c809efd174c2c2fd /arch/arm/include/asm/hardware/cache-l2x0.h | |
parent | 09fa31a322c8f03871a741cd1d26e5ca04aacbbd (diff) |
ARM: l2x0: add empty l2x0_of_init
Add empty version of l2x0_of_init for when CONFIG_CACHE_L2X0 is not selected.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Barry Song <21cnbao@gmail.com>
Reviewed-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/include/asm/hardware/cache-l2x0.h')
-rw-r--r-- | arch/arm/include/asm/hardware/cache-l2x0.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/include/asm/hardware/cache-l2x0.h b/arch/arm/include/asm/hardware/cache-l2x0.h index 434edccdf7f3..1db1143a9483 100644 --- a/arch/arm/include/asm/hardware/cache-l2x0.h +++ b/arch/arm/include/asm/hardware/cache-l2x0.h | |||
@@ -102,7 +102,14 @@ | |||
102 | 102 | ||
103 | #ifndef __ASSEMBLY__ | 103 | #ifndef __ASSEMBLY__ |
104 | extern void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask); | 104 | extern void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask); |
105 | #if defined(CONFIG_CACHE_L2X0) && defined(CONFIG_OF) | ||
105 | extern int l2x0_of_init(__u32 aux_val, __u32 aux_mask); | 106 | extern int l2x0_of_init(__u32 aux_val, __u32 aux_mask); |
107 | #else | ||
108 | static inline int l2x0_of_init(__u32 aux_val, __u32 aux_mask) | ||
109 | { | ||
110 | return -ENODEV; | ||
111 | } | ||
112 | #endif | ||
106 | 113 | ||
107 | struct l2x0_regs { | 114 | struct l2x0_regs { |
108 | unsigned long phy_base; | 115 | unsigned long phy_base; |
@@ -121,6 +128,6 @@ struct l2x0_regs { | |||
121 | 128 | ||
122 | extern struct l2x0_regs l2x0_saved_regs; | 129 | extern struct l2x0_regs l2x0_saved_regs; |
123 | 130 | ||
124 | #endif | 131 | #endif /* __ASSEMBLY__ */ |
125 | 132 | ||
126 | #endif | 133 | #endif |