AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] powerpc: Merge parport.h

Browse Source 
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>
This commit is contained in:
David Gibson 2005-10-24 13:07:23 +10:00 committed by Paul Mackerras
parent e37bc5df8e
commit 2765ca2540
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/asm-ppc/parport.h → include/asm-powerpc/parport.h
View File

@ -6,8 +6,8 @@
* This file should only be included by drivers/parport/parport_pc.c.
*/
#ifndef _ASM_PPC_PARPORT_H
#define _ASM_PPC_PARPORT_H
#ifndef _ASM_POWERPC_PARPORT_H
#define _ASM_POWERPC_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)
@ -15,4 +15,4 @@ 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) */
#endif /* !(_ASM_POWERPC_PARPORT_H) */

18
include/asm-ppc64/parport.h
View File

@ -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) */