drivers/tty/nozomi.c: rename CONFIG_MAGIC

The CONFIG_ prefix is reserved for Kconfig options in Make and CPP
syntax.  CONFIG_MAGIC is a file local CPP identifier so change the
prefix to apply to Kconfig's naming convention.

Signed-off-by: Valentin Rothberg <valentinrothberg@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index 74885af8c7bd2ca33cf4a0b86f0d418fb021405e..80f9de907563fc1ddebb2031d26553625e14c0a6 100644 (file)
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -140,8 +140,8 @@ static int debug;
 #define R_FCR          0x0000  /* Flow Control Register */
 #define R_IER          0x0004  /* Interrupt Enable Register */
 
-#define CONFIG_MAGIC   0xEFEFFEFE
-#define TOGGLE_VALID   0x0000
+#define NOZOMI_CONFIG_MAGIC    0xEFEFFEFE
+#define TOGGLE_VALID           0x0000
 
 /* Definition of interrupt tokens */
 #define MDM_DL1                0x0001
@@ -660,9 +660,9 @@ static int nozomi_read_config_table(struct nozomi *dc)
        read_mem32((u32 *) &dc->config_table, dc->base_addr + 0,
                                                sizeof(struct config_table));
 
-       if (dc->config_table.signature != CONFIG_MAGIC) {
+       if (dc->config_table.signature != NOZOMI_CONFIG_MAGIC) {
                dev_err(&dc->pdev->dev, "ConfigTable Bad! 0x%08X != 0x%08X\n",
-                       dc->config_table.signature, CONFIG_MAGIC);
+                       dc->config_table.signature, NOZOMI_CONFIG_MAGIC);
                return 0;
        }