From f2700a5fffb7fd80c0e3e8e7aa2775ebada6a646 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Mon, 24 Oct 2005 13:07:23 +1000 Subject: [PATCH] --- yaml --- r: 11673 b: refs/heads/master c: 2765ca254060adb9a5abc2cfc6264b8daafc5742 h: refs/heads/master i: 11671: 469e8a6d62b7a5b021dd1369dd3e01d464b116e6 v: v3 --- [refs] | 2 +- .../include/{asm-ppc => asm-powerpc}/parport.h | 6 +++--- trunk/include/asm-ppc64/parport.h | 18 ------------------ 3 files changed, 4 insertions(+), 22 deletions(-) rename trunk/include/{asm-ppc => asm-powerpc}/parport.h (80%) delete mode 100644 trunk/include/asm-ppc64/parport.h diff --git a/[refs] b/[refs] index f9a94845a465..4b2f206e8d3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e37bc5df8e96c72f27ec3579499726b656e4e641 +refs/heads/master: 2765ca254060adb9a5abc2cfc6264b8daafc5742 diff --git a/trunk/include/asm-ppc/parport.h b/trunk/include/asm-powerpc/parport.h similarity index 80% rename from trunk/include/asm-ppc/parport.h rename to trunk/include/asm-powerpc/parport.h index 11f96d3de5b6..d86b410a6f8b 100644 --- a/trunk/include/asm-ppc/parport.h +++ b/trunk/include/asm-powerpc/parport.h @@ -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) */ diff --git a/trunk/include/asm-ppc64/parport.h b/trunk/include/asm-ppc64/parport.h deleted file mode 100644 index 2f8874c581cc..000000000000 --- a/trunk/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 - * - * 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) */