Merge samba.org:/scratch/anton/linux-2.5

into samba.org:/scratch/anton/linux-2.5_ppc64_work

drivers/ide/setup-pci.c

@@ -693,7 +693,7 @@ static ata_index_t do_ide_setup_pci_device (struct pci_dev *dev, ide_pci_device_
 	int autodma = 0;
 	int pciirq = 0;
 	int tried_config = 0;
-	ata_index_t index;
+	ata_index_t index = { .b = { .low = 0xff, .high = 0xff } };
 
 	if((autodma = ide_setup_pci_controller(dev, d, noisy, &tried_config)) < 0)
 		return index;

include/linux/ide.h

@@ -1715,7 +1715,7 @@ static inline int __ide_dma_queued_off(ide_drive_t *drive)
 #endif
 
 #else
-static inline void ide_release_dma(ide_hwif_t *) {;}
+static inline void ide_release_dma(ide_hwif_t *drive) {;}
 #endif
 
 extern void hwif_unregister(ide_hwif_t *);