git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
net
/
wan
/
pc300_drv.c
diff --git
a/drivers/net/wan/pc300_drv.c
b/drivers/net/wan/pc300_drv.c
index
567efff
..
a3e65d1
100644
(file)
--- a/
drivers/net/wan/pc300_drv.c
+++ b/
drivers/net/wan/pc300_drv.c
@@
-3445,9
+3445,9
@@
cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
card = (pc300_t *) kmalloc(sizeof(pc300_t), GFP_KERNEL);
if (card == NULL) {
card = (pc300_t *) kmalloc(sizeof(pc300_t), GFP_KERNEL);
if (card == NULL) {
- printk("PC300 found at RAM 0x%0
16l
lx, "
+ printk("PC300 found at RAM 0x%0
8
lx, "
"but could not allocate card structure.\n",
"but could not allocate card structure.\n",
-
(unsigned long long)
pci_resource_start(pdev, 3));
+ pci_resource_start(pdev, 3));
err = -ENOMEM;
goto err_disable_dev;
}
err = -ENOMEM;
goto err_disable_dev;
}
@@
-3600,7
+3600,7
@@
cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
}
/* Allocate IRQ */
}
/* Allocate IRQ */
- if (request_irq(card->hw.irq, cpc_intr,
IRQF_SHARED
, "Cyclades-PC300", card)) {
+ if (request_irq(card->hw.irq, cpc_intr,
SA_SHIRQ
, "Cyclades-PC300", card)) {
printk ("PC300 found at RAM 0x%08x, but could not allocate IRQ%d.\n",
card->hw.ramphys, card->hw.irq);
goto err_io_unmap;
printk ("PC300 found at RAM 0x%08x, but could not allocate IRQ%d.\n",
card->hw.ramphys, card->hw.irq);
goto err_io_unmap;