[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>
git-mirror · Oct 27, 2005 · 2765ca2 · 2765ca2
1 parent e37bc5d
commit 2765ca2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/include/asm-ppc/parport.h → include/asm-powerpc/parport.h b/include/asm-ppc/parport.h → include/asm-powerpc/parport.h
@@ -6,13 +6,13 @@
  * 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)
 {
 	return parport_pc_find_isa_ports (autoirq, autodma);
 }
 
-#endif /* !(_ASM_PPC_PARPORT_H) */
+#endif /* !(_ASM_POWERPC_PARPORT_H) */
diff --git a/include/asm-ppc64/parport.h b/include/asm-ppc64/parport.h