mirror of
https://github.com/torvalds/linux.git
synced 2024-12-30 14:52:05 +00:00
db8ac55ca7
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>
29 lines
798 B
C
29 lines
798 B
C
/*
|
|
* parport.h: platform-specific PC-style parport initialisation
|
|
*
|
|
* Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk>
|
|
*
|
|
* This file should only be included by drivers/parport/parport_pc.c.
|
|
*
|
|
* RZ: for use with Q40 and other ISA machines
|
|
*/
|
|
|
|
#ifndef _ASM_M68K_PARPORT_H
|
|
#define _ASM_M68K_PARPORT_H 1
|
|
|
|
#undef insl
|
|
#undef outsl
|
|
#define insl(port,buf,len) isa_insb(port,buf,(len)<<2)
|
|
#define outsl(port,buf,len) isa_outsb(port,buf,(len)<<2)
|
|
|
|
/* no dma, or IRQ autoprobing */
|
|
static int parport_pc_find_isa_ports (int autoirq, int autodma);
|
|
static int parport_pc_find_nonpci_ports (int autoirq, int autodma)
|
|
{
|
|
if (! (MACH_IS_Q40))
|
|
return 0; /* count=0 */
|
|
return parport_pc_find_isa_ports (PARPORT_IRQ_NONE, PARPORT_DMA_NONE);
|
|
}
|
|
|
|
#endif /* !(_ASM_M68K_PARPORT_H) */
|