]>
Commit | Line | Data |
---|---|---|
e2574eff | 1 | --- linux.org/drivers/ide/setup-pci.c Sat Oct 18 01:22:22 2003 |
2 | +++ linux/drivers/ide/setup-pci.c Wed Nov 19 13:52:25 2003 | |
3 | @@ -474,6 +474,11 @@ | |
4 | * state | |
5 | */ | |
6 | ||
7 | +#ifndef CONFIG_BLK_DEV_IDEDMA_PCI | |
8 | +static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwif_t *hwif) | |
9 | +{ | |
10 | +} | |
11 | +#else | |
12 | static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwif_t *hwif) | |
13 | { | |
14 | u16 pcicmd; | |
15 | @@ -516,6 +521,7 @@ | |
16 | } | |
17 | } | |
18 | } | |
19 | +#endif /* CONFIG_BLK_DEV_IDEDMA_PCI*/ | |
20 | ||
21 | /** | |
22 | * ide_setup_pci_controller - set up IDE PCI | |
23 | --- linux.org/drivers/ide/Kconfig Wed Nov 19 18:40:45 2003 | |
24 | +++ linux/drivers/ide/Kconfig Thu Nov 20 14:32:13 2003 | |
25 | @@ -531,6 +531,8 @@ | |
26 | depends on PCI && BLK_DEV_IDEPCI | |
27 | default BLK_DEV_IDEDMA_PCI | |
28 | ||
29 | +endif | |
30 | + | |
31 | config BLK_DEV_AEC62XX | |
32 | tristate "AEC62XX chipset support" | |
33 | help | |
34 | @@ -800,7 +802,6 @@ | |
35 | This allows the kernel to change PIO, DMA and UDMA speeds and to | |
36 | configure the chip to optimum performance. | |
37 | ||
38 | -endif | |
39 | ||
40 | config BLK_DEV_IDE_PMAC | |
41 | bool "Builtin PowerMac IDE support" |