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>
This commit is contained in:
@@ -15,12 +15,12 @@
|
||||
#include <linux/fb.h>
|
||||
#include <linux/screen_info.h>
|
||||
|
||||
#ifdef CONFIG_ARC
|
||||
#ifdef CONFIG_FW_ARC
|
||||
#include <asm/fw/arc/types.h>
|
||||
#include <asm/sgialib.h>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SNIPROM
|
||||
#ifdef CONFIG_FW_SNIPROM
|
||||
#include <asm/mipsprom.h>
|
||||
#endif
|
||||
|
||||
@@ -37,7 +37,7 @@ extern void sni_machine_power_off(void);
|
||||
|
||||
static void __init sni_display_setup(void)
|
||||
{
|
||||
#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE) && defined(CONFIG_ARC)
|
||||
#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE) && defined(CONFIG_FW_ARC)
|
||||
struct screen_info *si = &screen_info;
|
||||
DISPLAY_STATUS *di;
|
||||
|
||||
@@ -56,7 +56,7 @@ static void __init sni_display_setup(void)
|
||||
|
||||
static void __init sni_console_setup(void)
|
||||
{
|
||||
#ifndef CONFIG_ARC
|
||||
#ifndef CONFIG_FW_ARC
|
||||
char *ctype;
|
||||
char *cdev;
|
||||
char *baud;
|
||||
|
Reference in New Issue
Block a user