---

yaml --- r: 3455 b: refs/heads/master c: 12b279f h: refs/heads/master i: 3453: 5e80bb7 3451: 93d2ab2 3447: b6849d8 3439: 8fac51b 3423: 76e9576 3391: 4e8fe94 3327: c5a9a02 v: v3
git-mirror · Jun 26, 2005 · ae1236c · ae1236c
1 parent dcf1dd7
commit ae1236c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8c0eee96801f3c3f577b377b89ab01ab36ba7b6
+refs/heads/master: 12b279f9c0cb70695865dc336161512fa6e75d50
diff --git a/trunk/drivers/net/sis900.c b/trunk/drivers/net/sis900.c
@@ -66,6 +66,7 @@
 #include <linux/ethtool.h>
 #include <linux/crc32.h>
 #include <linux/bitops.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/processor.h>      /* Processor type for cache alignment. */
 #include <asm/io.h>
@@ -93,8 +94,6 @@ static int sis900_debug = -1; /* Use SIS900_DEF_MSG as value */
 
 /* Time in jiffies before concluding the transmitter is hung. */
 #define TX_TIMEOUT  (4*HZ)
-/* SiS 900 is capable of 32 bits BM DMA */
-#define SIS900_DMA_MASK 0xffffffff
 
 enum {
 	SIS_900 = 0,
@@ -414,7 +413,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
 	ret = pci_enable_device(pci_dev);
 	if(ret) return ret;
 
-	i = pci_set_dma_mask(pci_dev, SIS900_DMA_MASK);
+	i = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK);
 	if(i){
 		printk(KERN_ERR "sis900.c: architecture does not support"
 			"32bit PCI busmaster DMA\n");