patch-2.3.99-pre1 linux/include/asm-sparc64/parport.h

• Lines: 37
• Date: Tue Mar 14 18:04:50 2000
• Orig file: v2.3.51/linux/include/asm-sparc64/parport.h
• Orig date: Tue Feb 1 01:35:44 2000

diff -u --recursive --new-file v2.3.51/linux/include/asm-sparc64/parport.h linux/include/asm-sparc64/parport.h
@@ -11,14 +11,6 @@
 #include <asm/ebus.h>
 #include <asm/ns87303.h>
 
-#ifdef CONFIG_PARPORT_PC_PCMCIA
-#define __maybe_init
-#define __maybe_initdata
-#else
-#define __maybe_init __init
-#define __maybe_initdata __initdata
-#endif
-
 #define PARPORT_PC_MAX_PORTS	PARPORT_MAX
 
 static struct linux_ebus_dma *sparc_ebus_dmas[PARPORT_PC_MAX_PORTS];
@@ -108,12 +100,7 @@
 	return res;
 }
 
-static int __maybe_init parport_pc_init_pci(int irq, int dma);
-
-static int user_specified __initdata = 0;
-
-int __init
-parport_pc_init(int *io, int *io_hi, int *irq, int *dma)
+static int parport_pc_find_nonpci_ports (int autoirq, int autodma)
 {
 	struct linux_ebus *ebus;
 	struct linux_ebus_device *edev;
@@ -155,7 +142,6 @@
 		}
 	}
 
-	count += parport_pc_init_pci(PARPORT_IRQ_AUTO, PARPORT_DMA_NONE);
 	return count;
 }