Merge branch 'x86/core' into x86/apic

[karo-tx-linux.git] / include / asm-x86 / parport.h

diff --git a/include/asm-x86/parport.h b/include/asm-x86/parport.h
index 2a31157349c922ec5fa52ef646cd535fca88c8d5..2e3dda4dc3d9b9f4bc243ca5a5b82b15be18263c 100644 (file)
--- 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 */