From ae1236cd01596d8f418874b3f6c8a06d9f86842a Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@nuerscht.ch>
Date: Mon, 4 Apr 2005 18:10:18 +0200
Subject: [PATCH] --- yaml --- r: 3455 b: refs/heads/master c:
 12b279f9c0cb70695865dc336161512fa6e75d50 h: refs/heads/master i:   3453:
 5e80bb747c03cbadcfa8c6c967cd5aaa4bbc531a   3451:
 93d2ab27a09adf0550db74f7cbc5c18c9c5dbcb9   3447:
 b6849d82ef8b97c1b841c936524af22a61e029da   3439:
 8fac51bc3a4fa00065225824436cbfee9ac9dfad   3423:
 76e95765d55f85ca23bc78dfde5d7968ab7ae16d   3391:
 4e8fe94113d6e001977b8d48dce08be8fea0f1d9   3327:
 c5a9a020cfbc44833020007d6a77cd4200d7ced6 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/sis900.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5226d4ca1a26..59a334164324 100644
--- 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
index 3107aed0fb51..127324f014de 100644
--- 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");