[Prism54-devel] new commits, please test

[Joerg Dorchain]

Hi all,

I want to point out that the following patch needed for me to compile
(against 2.6.11) is not in yet.

Bye,

Joerg

Index: ksrc/islpci_hotplug.c
===================================================================
--- ksrc/islpci_hotplug.c	(revision 528)
+++ ksrc/islpci_hotplug.c	(working copy)
@@ -277,7 +277,7 @@
 	printk(KERN_NOTICE "%s: got suspend request (state %d)\n",
 	       ndev->name, state);
 
-	pci_save_state(pdev, priv->pci_state);
+	pci_save_state(pdev);
 
 	/* tell the device not to trigger interrupts for now... */
 	isl38xx_disable_interrupts(priv->device_base);
@@ -303,7 +303,7 @@
 
 	printk(KERN_NOTICE "%s: got resume request\n", ndev->name);
 
-	pci_restore_state(pdev, priv->pci_state);
+	pci_restore_state(pdev);
 
 	/* alright let's go into the PREBOOT state */
 	islpci_reset(priv, 1);
Index: ksrc/islpci_mgt.c
===================================================================
--- ksrc/islpci_mgt.c	(revision 528)
+++ ksrc/islpci_mgt.c	(working copy)
@@ -345,7 +345,7 @@
 		}
 
 		/* Ensure the results of device DMA are visible to the CPU. */
-		pci_dma_sync_single(priv->pdev, buf->pci_addr,
+		pci_dma_sync_single_for_cpu(priv->pdev, buf->pci_addr,
 				frag_len, PCI_DMA_FROMDEVICE);
 
 		/* Perform endianess conversion for PIMFOR header in-place. */
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://prism54.org/pipermail/prism54-devel/attachments/20050310/d7d17c1d/attachment.pgp