m68k/q40: Undefine insl/outsl before redefining them
authorGeert Uytterhoeven <geert@linux-m68k.org>
Mon, 17 Jun 2013 15:40:01 +0000 (17:40 +0200)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Mon, 24 Jun 2013 17:44:19 +0000 (19:44 +0200)
commitdb8ac55ca7908a484c11f15c100358d65c108225
tree36cb68d1d7a7cb755d129a3c1fc097f2b317243d
parent631d8b674f5f8235e9cb7e628b0fe9e5200e3158
m68k/q40: Undefine insl/outsl before redefining them

To use the PC parallel port driver on Q40, we need non-standard versions of
the insl/outsl accessors. Make sure to undefine them first, to kill this
compiler warning:

In file included from drivers/parport/parport_pc.c:67:
arch/m68k/include/asm/parport.h:14:1: warning: "insl" redefined
In file included from arch/m68k/include/asm/io.h:4,
                 from include/linux/scatterlist.h:10,
                 from include/linux/dma-mapping.h:9,
                 from drivers/parport/parport_pc.c:54:
arch/m68k/include/asm/io_mm.h:370:1: warning: this is the location of the previous definition
In file included from drivers/parport/parport_pc.c:67:
arch/m68k/include/asm/parport.h:15:1: warning: "outsl" redefined
In file included from arch/m68k/include/asm/io.h:4,
                 from include/linux/scatterlist.h:10,
                 from include/linux/dma-mapping.h:9,
                 from drivers/parport/parport_pc.c:54:
arch/m68k/include/asm/io_mm.h:373:1: warning: this is the location of the previous definition

Reported-by: Thorsten Glaser <tg@debian.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/include/asm/parport.h