diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:33:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:33:01 -0800 |
| commit | ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132 (patch) | |
| tree | d498e947176f4b77938034ff6c6427f9875da721 /arch/m68k/include/asm/parport.h | |
| parent | 9f4863b7dc7f545bb3a01746feafdc1208e86c89 (diff) | |
| parent | 49148020bcb6910ce71417bd990a5ce7017f9bd3 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k,m68knommu: merge header files
Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild
Diffstat (limited to 'arch/m68k/include/asm/parport.h')
| -rw-r--r-- | arch/m68k/include/asm/parport.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/parport.h b/arch/m68k/include/asm/parport.h new file mode 100644 index 00000000000..646b1872f73 --- /dev/null +++ b/arch/m68k/include/asm/parport.h @@ -0,0 +1,26 @@ +/* + * 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 + +#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 __devinit parport_pc_find_isa_ports (int autoirq, int autodma); +static int __devinit 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) */ |