]>
Commit | Line | Data |
---|---|---|
8ddc4496 | 1 | --- drivers/parport/parport_pc.c~ Wed Feb 14 02:41:01 2001 |
2 | +++ drivers/parport/parport_pc.c Thu Mar 1 00:54:19 2001 | |
3 | @@ -11,6 +11,7 @@ | |
4 | * Cleaned up include files - Russell King <linux@arm.uk.linux.org> | |
5 | * DMA support - Bert De Jonghe <bert@sophis.be> | |
6 | * Many ECP bugs fixed. Fred Barnes & Jamie Lokier, 1999 | |
7 | + * More PCI support now conditional on CONFIG_PCI, 03/2001, Paul G. | |
8 | */ | |
9 | ||
10 | /* This driver should work with any hardware that is broadly compatible | |
11 | @@ -2182,6 +2183,7 @@ | |
12 | } | |
13 | ||
14 | ||
15 | +#ifdef CONFIG_PCI | |
16 | /* Via support maintained by Jeff Garzik <jgarzik@mandrakesoft.com> */ | |
17 | static int __devinit sio_via_686a_probe (struct pci_dev *pdev) | |
18 | { | |
19 | @@ -2547,7 +2549,6 @@ | |
20 | ||
21 | static int __init parport_pc_init_superio (void) | |
22 | { | |
23 | -#ifdef CONFIG_PCI | |
24 | const struct pci_device_id *id; | |
25 | struct pci_dev *pdev; | |
26 | ||
27 | @@ -2558,10 +2559,13 @@ | |
28 | ||
29 | return parport_pc_superio_info[id->driver_data].probe (pdev); | |
30 | } | |
31 | -#endif /* CONFIG_PCI */ | |
32 | ||
33 | return 0; /* zero devices found */ | |
34 | } | |
35 | +#else | |
36 | +static struct pci_driver parport_pc_pci_driver; | |
37 | +static int __init parport_pc_init_superio(void) {return 0;} | |
38 | +#endif /* CONFIG_PCI */ | |
39 | ||
40 | /* This is called by parport_pc_find_nonpci_ports (in asm/parport.h) */ | |
41 | static int __init __attribute__((unused)) | |
42 |