Commit 2765ca25 authored by David Gibson's avatar David Gibson Committed by Paul Mackerras

[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: default avatarDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent e37bc5df
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* This file should only be included by drivers/parport/parport_pc.c. * This file should only be included by drivers/parport/parport_pc.c.
*/ */
#ifndef _ASM_PPC_PARPORT_H #ifndef _ASM_POWERPC_PARPORT_H
#define _ASM_PPC_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_isa_ports (int autoirq, int autodma);
static int __devinit parport_pc_find_nonpci_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) ...@@ -15,4 +15,4 @@ static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)
return parport_pc_find_isa_ports (autoirq, autodma); return parport_pc_find_isa_ports (autoirq, autodma);
} }
#endif /* !(_ASM_PPC_PARPORT_H) */ #endif /* !(_ASM_POWERPC_PARPORT_H) */
/*
* 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) */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment