projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'trace-v4.4-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
nozomi.c
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 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
/* 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));
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",
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;
}
return 0;
}