X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fpci%2Fhotplug%2Fcpcihp_zt5550.c;fp=drivers%2Fpci%2Fhotplug%2Fcpcihp_zt5550.c;h=f7cb00da38dfabbfd32e6c6ec366bf261f9ed7e4;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=1c12e9171097cba1de5dffb6f13ea605e9116d59;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
index 1c12e9171..f7cb00da3 100644
--- a/drivers/pci/hotplug/cpcihp_zt5550.c
+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
@@ -30,13 +30,13 @@
  * Send feedback to <scottm@somanetworks.com>
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <linux/signal.h>	/* IRQF_SHARED */
+#include <linux/signal.h>	/* SA_SHIRQ */
 #include "cpci_hotplug.h"
 #include "cpcihp_zt5550.h"
 
@@ -95,8 +95,8 @@ static int zt5550_hc_config(struct pci_dev *pdev)
 
 	hc_dev = pdev;
 	dbg("hc_dev = %p", hc_dev);
-	dbg("pci resource start %llx", (unsigned long long)pci_resource_start(hc_dev, 1));
-	dbg("pci resource len %llx", (unsigned long long)pci_resource_len(hc_dev, 1));
+	dbg("pci resource start %lx", pci_resource_start(hc_dev, 1));
+	dbg("pci resource len %lx", pci_resource_len(hc_dev, 1));
 
 	if(!request_mem_region(pci_resource_start(hc_dev, 1),
 				pci_resource_len(hc_dev, 1), MY_NAME)) {
@@ -108,9 +108,8 @@ static int zt5550_hc_config(struct pci_dev *pdev)
 	hc_registers =
 	    ioremap(pci_resource_start(hc_dev, 1), pci_resource_len(hc_dev, 1));
 	if(!hc_registers) {
-		err("cannot remap MMIO region %llx @ %llx",
-			(unsigned long long)pci_resource_len(hc_dev, 1),
-			(unsigned long long)pci_resource_start(hc_dev, 1));
+		err("cannot remap MMIO region %lx @ %lx",
+		    pci_resource_len(hc_dev, 1), pci_resource_start(hc_dev, 1));
 		ret = -ENODEV;
 		goto exit_release_region;
 	}
@@ -220,7 +219,7 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
 	zt5550_hpc.ops = &zt5550_hpc_ops;
 	if(!poll) {
 		zt5550_hpc.irq = hc_dev->irq;
-		zt5550_hpc.irq_flags = IRQF_SHARED;
+		zt5550_hpc.irq_flags = SA_SHIRQ;
 		zt5550_hpc.dev_id = hc_dev;
 
 		zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;