commit 003a46cfff308ee0d879dfa89b9a7c65b2a481bf
author Thomas Gleixner <tglx@linutronix.de> Mon Oct 15 13:57:47 2007 +0200
committer Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> Wed Oct 17 20:17:10 2007 +0200
tree 234552110912d4b9d6519474823e98e1a1726d16
parent 217d115cd5d7d2bef7db7839b93ce5dc2867c392

x86: unify some more trivial include/asm-x86/ 32/64 variants

Scripted unification.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

include/asm-x86/parport.h

diff --git a/include/asm-x86/parport.h b/include/asm-x86/parport.h
index 2a31157..019cbca 100644
--- a/include/asm-x86/parport.h
+++ b/include/asm-x86/parport.h
@@ -1,5 +1,10 @@
-#ifdef CONFIG_X86_32
-# include "parport_32.h"
-#else
-# include "parport_64.h"
-#endif
+#ifndef _ASM_X86_PARPORT_H
+#define _ASM_X86_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_X86_PARPORT_H */