Merge with rsync://fileserver/linux

Update to 2.6.12-rc3

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index cf31c0629852..942fae0f2130 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -171,6 +171,7 @@
 #include <linux/ioport.h>
 #include <linux/eisa.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/delay.h>
@@ -566,7 +567,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
 
                 priv->adapter = &board_info[ent->driver_data];
 
-                rc = pci_set_dma_mask(pdev, 0xFFFFFFFF);
+                rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                 if (rc) {
                         printk(KERN_ERR "TLAN: No suitable PCI mapping available.\n");
                         goto err_out_free_dev;