diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 14:59:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 14:59:11 -0700 |
| commit | 2b12a4c524812fb3f6ee590a02e65b95c8c32229 (patch) | |
| tree | 6d319a371c56798d2d5c3ad21801eba142a1c77e /arch/ia64/include/asm/parport.h | |
| parent | 4744b43431e8613f920c5cba88346756f53c5165 (diff) | |
| parent | 7f30491ccd28627742e37899453ae20e3da8e18f (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Move include/asm-ia64 to arch/ia64/include/asm
Diffstat (limited to 'arch/ia64/include/asm/parport.h')
| -rw-r--r-- | arch/ia64/include/asm/parport.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/parport.h b/arch/ia64/include/asm/parport.h new file mode 100644 index 00000000000..67e16adfcd2 --- /dev/null +++ b/arch/ia64/include/asm/parport.h @@ -0,0 +1,20 @@ +/* + * 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. + */ + +#ifndef _ASM_IA64_PARPORT_H +#define _ASM_IA64_PARPORT_H 1 + +static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma); + +static int __devinit +parport_pc_find_nonpci_ports (int autoirq, int autodma) +{ + return parport_pc_find_isa_ports(autoirq, autodma); +} + +#endif /* _ASM_IA64_PARPORT_H */ |