drivers/tty/nozomi.c: Use 'nozomi_setup_memory' instead of 'setup_memory'
authorChen Gang <gang.chen.5i5j@gmail.com>
Fri, 8 Aug 2014 15:56:34 +0000 (23:56 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Sep 2014 23:09:23 +0000 (16:09 -0700)
commit7acb88af6fedc4424a99425308a2f3e50d5ff1bc
tree7fe0ba93b6870239d90799cef386faf0f49cbc23
parent4bb2bd0798447c67d563311f337db9c2f390f2c6
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>
drivers/tty/nozomi.c