diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-02-19 10:00:34 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-02-19 10:00:34 -0500 |
| commit | 661af35e5fd878f915ed05dbbfe383f64133f98c (patch) | |
| tree | 956b7efd662b682224e61060552fdcf4201101bf /arch/mips/include/asm/spram.h | |
| parent | ca5d25642e212f73492d332d95dc90ef46a0e8dc (diff) | |
| parent | f296e7c48d3155991b99f41372e1786c5be03457 (diff) | |
Merge branch 'mipsr6-for-3.20' of git://git.linux-mips.org/pub/scm/mchandras/linux into mips-for-linux-next
Diffstat (limited to 'arch/mips/include/asm/spram.h')
| -rw-r--r-- | arch/mips/include/asm/spram.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/include/asm/spram.h b/arch/mips/include/asm/spram.h index 0b89006e4907..0f90d88e464d 100644 --- a/arch/mips/include/asm/spram.h +++ b/arch/mips/include/asm/spram.h | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | #ifndef _MIPS_SPRAM_H | 1 | #ifndef _MIPS_SPRAM_H |
| 2 | #define _MIPS_SPRAM_H | 2 | #define _MIPS_SPRAM_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_CPU_MIPSR2 | 4 | #if defined(CONFIG_MIPS_SPRAM) |
| 5 | extern __init void spram_config(void); | 5 | extern __init void spram_config(void); |
| 6 | #else | 6 | #else |
| 7 | static inline void spram_config(void) { }; | 7 | static inline void spram_config(void) { }; |
| 8 | #endif /* CONFIG_CPU_MIPSR2 */ | 8 | #endif /* CONFIG_MIPS_SPRAM */ |
| 9 | 9 | ||
| 10 | #endif /* _MIPS_SPRAM_H */ | 10 | #endif /* _MIPS_SPRAM_H */ |