diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
| commit | 8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch) | |
| tree | b88cc5a6cd513a04a512b7e6215c873c90a1c5dd /include/asm-sparc64 | |
| parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) | |
Merge with 2.3.99-pre1.
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/parport.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h index 259c755d5..dac004a6b 100644 --- a/include/asm-sparc64/parport.h +++ b/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 @@ get_dma_residue(unsigned int dmanr) 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 @@ parport_pc_init(int *io, int *io_hi, int *irq, int *dma) } } - count += parport_pc_init_pci(PARPORT_IRQ_AUTO, PARPORT_DMA_NONE); return count; } |