diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2005-10-23 23:07:23 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-27 06:50:54 -0400 |
| commit | 2765ca254060adb9a5abc2cfc6264b8daafc5742 (patch) | |
| tree | e4b94377aa8f6b6e155448b6a7b8d5e4baa2fc72 /include/asm-ppc64 | |
| parent | e37bc5df8e96c72f27ec3579499726b656e4e641 (diff) | |
[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 2f8874c581cc..000000000000 --- a/include/asm-ppc64/parport.h +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * parport.h: platform-specific PC-style parport initialisation | ||
| 3 | * | ||
| 4 | * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk> | ||
| 5 | * | ||
| 6 | * This file should only be included by drivers/parport/parport_pc.c. | ||
| 7 | */ | ||
| 8 | |||
| 9 | #ifndef _ASM_PPC64_PARPORT_H | ||
| 10 | #define _ASM_PPC64_PARPORT_H | ||
| 11 | |||
| 12 | static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma); | ||
| 13 | static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma) | ||
| 14 | { | ||
| 15 | return parport_pc_find_isa_ports (autoirq, autodma); | ||
| 16 | } | ||
| 17 | |||
| 18 | #endif /* !(_ASM_PPC_PARPORT_H) */ | ||