1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 5f743b972949..d05c5aa254ee 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -31,7 +31,6 @@
 #define DRV_VERSION             "0.7"
 #define DRV_RELDATE             "Mar 17, 2004"
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
@@ -1372,7 +1371,7 @@ static int de_open (struct net_device *dev)
 
         dw32(IntrMask, 0);
 
-        rc = request_irq(dev->irq, de_interrupt, SA_SHIRQ, dev->name, dev);
+        rc = request_irq(dev->irq, de_interrupt, IRQF_SHARED, dev->name, dev);
         if (rc) {
                 printk(KERN_ERR "%s: IRQ %d request failure, err=%d\n",
                        dev->name, dev->irq, rc);
@@ -2007,8 +2006,8 @@ static int __init de_init_one (struct pci_dev *pdev,
         }
         if (pci_resource_len(pdev, 1) < DE_REGS_SIZE) {
                 rc = -EIO;
-                printk(KERN_ERR PFX "MMIO resource (%lx) too small on pci dev %s\n",
-                       pci_resource_len(pdev, 1), pci_name(pdev));
+                printk(KERN_ERR PFX "MMIO resource (%llx) too small on pci dev %s\n",
+                       (unsigned long long)pci_resource_len(pdev, 1), pci_name(pdev));
                 goto err_out_res;
         }
 
@@ -2016,8 +2015,9 @@ static int __init de_init_one (struct pci_dev *pdev,
         regs = ioremap_nocache(pciaddr, DE_REGS_SIZE);
         if (!regs) {
                 rc = -EIO;
-                printk(KERN_ERR PFX "Cannot map PCI MMIO (%lx@%lx) on pci dev %s\n",
-                       pci_resource_len(pdev, 1), pciaddr, pci_name(pdev));
+                printk(KERN_ERR PFX "Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n",
+                        (unsigned long long)pci_resource_len(pdev, 1),
+                        pciaddr, pci_name(pdev));
                 goto err_out_res;
         }
         dev->base_addr = (unsigned long) regs;