tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[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>
authored by
David Gibson
and committed by
Paul Mackerras
2765ca25
e37bc5df
+3
-21
+3
-3
include/asm-ppc/parport.h
include/asm-powerpc/parport.h
+3
-3
include/asm-ppc/parport.h
include/asm-powerpc/parport.h
···
6
6
* This file should only be included by drivers/parport/parport_pc.c.
7
7
*/
8
8
9
-
#ifndef _ASM_PPC_PARPORT_H
10
-
#define _ASM_PPC_PARPORT_H
9
+
#ifndef _ASM_POWERPC_PARPORT_H
10
+
#define _ASM_POWERPC_PARPORT_H
11
11
12
12
static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma);
13
13
static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)
···
15
15
return parport_pc_find_isa_ports (autoirq, autodma);
16
16
}
17
17
18
-
#endif /* !(_ASM_PPC_PARPORT_H) */
18
+
#endif /* !(_ASM_POWERPC_PARPORT_H) */
-18
include/asm-ppc64/parport.h
-18
include/asm-ppc64/parport.h
···
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) */