summaryrefslogtreecommitdiffstats
path: root/drivers/tty/nozomi.c
diff options
context:
space:
mode:
authorValentin Rothberg <valentinrothberg@gmail.com>2015-04-12 18:35:18 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-10 19:19:06 +0200
commit03ac6b3499c8a0b1fbb5c33ad6234a9e860f2614 (patch)
treee0b7236c418d3c2f625a8f7537d493edef9bd863 /drivers/tty/nozomi.c
parent360ee94b47a80b0e986c9e890f1862d29edf2c45 (diff)
downloadlinux-03ac6b3499c8a0b1fbb5c33ad6234a9e860f2614.tar.gz
linux-03ac6b3499c8a0b1fbb5c33ad6234a9e860f2614.tar.bz2
linux-03ac6b3499c8a0b1fbb5c33ad6234a9e860f2614.zip
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>
Diffstat (limited to 'drivers/tty/nozomi.c')
-rw-r--r--drivers/tty/nozomi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index 74885af8c7bd..80f9de907563 100644
--- 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;
}