projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[powerpc.git]
/
drivers
/
block
/
umem.c
diff --git
a/drivers/block/umem.c
b/drivers/block/umem.c
index
f675f97
..
5d8925b
100644
(file)
--- a/
drivers/block/umem.c
+++ b/
drivers/block/umem.c
@@
-1040,7
+1040,7
@@
static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
card->win_size = data;
card->win_size = data;
- if (request_irq(dev->irq, mm_interrupt,
SA_SHIRQ
, "pci-umem", card)) {
+ if (request_irq(dev->irq, mm_interrupt,
IRQF_SHARED
, "pci-umem", card)) {
printk(KERN_ERR "MM%d: Unable to allocate IRQ\n", card->card_number);
ret = -ENODEV;
printk(KERN_ERR "MM%d: Unable to allocate IRQ\n", card->card_number);
ret = -ENODEV;