diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2012-11-15 14:48:50 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-12-13 11:02:14 -0500 |
commit | 0e2794b0b72f38d0dd5aa8474e22b1fe56fb8bd1 (patch) | |
tree | e5bb62e59914a7177e4ed6cbe7b81769fc7d5cf7 /arch/mips/sni/setup.c | |
parent | abe77f90dc9c65a7c9a4d61c2cbb8db4d5566e4f (diff) |
MIPS: Kconfig: Rename several firmware related config symbols.
With the upcoming merge of the ARC architecture there is a small likelyhood
of conflicting use for the CONFIG_ARC config symbol. Rename it to
CONFIG_FW_ARC. Also rename CONFIG_ARC32 to CONFIG_FW_ARC32, CONFIG_ARC64
to CONFIG_FW_ARC64.
For consistence also rename CONFIG_SNIPROM to CONFIG_FW_SNIPROM and
CONFIG_CFE to CONFIG_FW_CFE.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/sni/setup.c')
-rw-r--r-- | arch/mips/sni/setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c index 413f17f8e892..d6c7bd4b5ab0 100644 --- a/arch/mips/sni/setup.c +++ b/arch/mips/sni/setup.c | |||
@@ -15,12 +15,12 @@ | |||
15 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
16 | #include <linux/screen_info.h> | 16 | #include <linux/screen_info.h> |
17 | 17 | ||
18 | #ifdef CONFIG_ARC | 18 | #ifdef CONFIG_FW_ARC |
19 | #include <asm/fw/arc/types.h> | 19 | #include <asm/fw/arc/types.h> |
20 | #include <asm/sgialib.h> | 20 | #include <asm/sgialib.h> |
21 | #endif | 21 | #endif |
22 | 22 | ||
23 | #ifdef CONFIG_SNIPROM | 23 | #ifdef CONFIG_FW_SNIPROM |
24 | #include <asm/mipsprom.h> | 24 | #include <asm/mipsprom.h> |
25 | #endif | 25 | #endif |
26 | 26 | ||
@@ -37,7 +37,7 @@ extern void sni_machine_power_off(void); | |||
37 | 37 | ||
38 | static void __init sni_display_setup(void) | 38 | static void __init sni_display_setup(void) |
39 | { | 39 | { |
40 | #if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE) && defined(CONFIG_ARC) | 40 | #if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE) && defined(CONFIG_FW_ARC) |
41 | struct screen_info *si = &screen_info; | 41 | struct screen_info *si = &screen_info; |
42 | DISPLAY_STATUS *di; | 42 | DISPLAY_STATUS *di; |
43 | 43 | ||
@@ -56,7 +56,7 @@ static void __init sni_display_setup(void) | |||
56 | 56 | ||
57 | static void __init sni_console_setup(void) | 57 | static void __init sni_console_setup(void) |
58 | { | 58 | { |
59 | #ifndef CONFIG_ARC | 59 | #ifndef CONFIG_FW_ARC |
60 | char *ctype; | 60 | char *ctype; |
61 | char *cdev; | 61 | char *cdev; |
62 | char *baud; | 62 | char *baud; |