projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] irq-flags: isdn: Use the new IRQF_ constants
[powerpc.git]
/
drivers
/
atm
/
ambassador.c
diff --git
a/drivers/atm/ambassador.c
b/drivers/atm/ambassador.c
index
d74a7c5
..
4048681
100644
(file)
--- a/
drivers/atm/ambassador.c
+++ b/
drivers/atm/ambassador.c
@@
-795,7
+795,7
@@
static void drain_rx_pools (amb_dev * dev) {
}
static inline void fill_rx_pool (amb_dev * dev, unsigned char pool,
}
static inline void fill_rx_pool (amb_dev * dev, unsigned char pool,
-
unsigned int __nocas
t priority)
+
gfp_
t priority)
{
rx_in rx;
amb_rxq * rxq;
{
rx_in rx;
amb_rxq * rxq;
@@
-2257,7
+2257,8
@@
static int __devinit amb_probe(struct pci_dev *pci_dev, const struct pci_device_
}
PRINTD (DBG_INFO, "found Madge ATM adapter (amb) at"
}
PRINTD (DBG_INFO, "found Madge ATM adapter (amb) at"
- " IO %lx, IRQ %u, MEM %p", pci_resource_start(pci_dev, 1),
+ " IO %llx, IRQ %u, MEM %p",
+ (unsigned long long)pci_resource_start(pci_dev, 1),
irq, bus_to_virt(pci_resource_start(pci_dev, 0)));
// check IO region
irq, bus_to_virt(pci_resource_start(pci_dev, 0)));
// check IO region