Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit db8ac55ca7908a484c11f15c100358d65c108225

Authored by Geert Uytterhoeven
1 parent 631d8b674f
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

arch/m68k/include/asm/parport.h
Diff comments   View file @ db8ac55
... ... @@ -11,6 +11,8 @@
11 11 #ifndef _ASM_M68K_PARPORT_H
12 12 #define _ASM_M68K_PARPORT_H 1
13 13  
  14 +#undef insl
  15 +#undef outsl
14 16 #define insl(port,buf,len) isa_insb(port,buf,(len)<<2)
15 17 #define outsl(port,buf,len) isa_outsb(port,buf,(len)<<2)
16 18