diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2005-10-24 13:07:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-27 20:50:54 +1000 |
| commit | 2765ca254060adb9a5abc2cfc6264b8daafc5742 (patch) | |
| tree | e4b94377aa8f6b6e155448b6a7b8d5e4baa2fc72 /include/asm-ppc64 | |
| parent | e37bc5df8e96c72f27ec3579499726b656e4e641 (diff) | |
| download | op-kernel-dev-2765ca254060adb9a5abc2cfc6264b8daafc5742.zip op-kernel-dev-2765ca254060adb9a5abc2cfc6264b8daafc5742.tar.gz | |
[PATCH] powerpc: Merge parport.h
Save for the header #define, ppc32 and ppc64 versions of parport.h are
identical. This patch merges them.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc64')
| -rw-r--r-- | include/asm-ppc64/parport.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/asm-ppc64/parport.h b/include/asm-ppc64/parport.h deleted file mode 100644 index 2f8874c..0000000 --- a/include/asm-ppc64/parport.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * 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_PPC64_PARPORT_H -#define _ASM_PPC64_PARPORT_H - -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_PPC_PARPORT_H) */ |
