diff options
| author | Chen Gang <gang.chen.5i5j@gmail.com> | 2014-08-08 23:56:34 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-08 16:09:23 -0700 |
| commit | 7acb88af6fedc4424a99425308a2f3e50d5ff1bc (patch) | |
| tree | 7fe0ba93b6870239d90799cef386faf0f49cbc23 /drivers/tty/nozomi.c | |
| parent | 4bb2bd0798447c67d563311f337db9c2f390f2c6 (diff) | |
| download | linux-7acb88af6fedc4424a99425308a2f3e50d5ff1bc.tar.bz2 | |
drivers/tty/nozomi.c: Use 'nozomi_setup_memory' instead of 'setup_memory'
Several architectures (e.g. microblaze, um, and score) have already have
extern 'setup_memory', so need use 'nozomi_setup_memory' instead of, or
will cause compiling issue.
The related error (with allmodconfig for microblaze):
CC [M] drivers/tty/nozomi.o
drivers/tty/nozomi.c:526:13: error: conflicting types for 'setup_memory'
static void setup_memory(struct nozomi *dc)
^
In file included from include/linux/mm.h:51:0,
from ./arch/microblaze/include/asm/io.h:17,
from include/linux/io.h:22,
from include/linux/pci.h:31,
from drivers/tty/nozomi.c:46:
./arch/microblaze/include/asm/pgtable.h:569:6: note: previous declaration of 'setup_memory' was here
void setup_memory(void);
^
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Acked-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/nozomi.c')
| -rw-r--r-- | drivers/tty/nozomi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c index cd0429369557..74885af8c7bd 100644 --- a/drivers/tty/nozomi.c +++ b/drivers/tty/nozomi.c @@ -523,7 +523,7 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf, } /* Setup pointers to different channels and also setup buffer sizes. */ -static void setup_memory(struct nozomi *dc) +static void nozomi_setup_memory(struct nozomi *dc) { void __iomem *offset = dc->base_addr + dc->config_table.dl_start; /* The length reported is including the length field of 4 bytes, @@ -671,7 +671,7 @@ static int nozomi_read_config_table(struct nozomi *dc) int i; DBG1("Second phase, configuring card"); - setup_memory(dc); + nozomi_setup_memory(dc); dc->port[PORT_MDM].toggle_ul = dc->config_table.toggle.mdm_ul; dc->port[PORT_MDM].toggle_dl = dc->config_table.toggle.mdm_dl; @@ -705,7 +705,7 @@ static int nozomi_read_config_table(struct nozomi *dc) dc->config_table.version); /* Here we should disable all I/O over F32. */ - setup_memory(dc); + nozomi_setup_memory(dc); /* * We should send ALL channel pair tokens back along |