projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Auto merge with /home/aegl/GIT/linus
[cascardo/linux.git]
/
include
/
asm-ia64
/
pci.h
diff --git
a/include/asm-ia64/pci.h
b/include/asm-ia64/pci.h
index
8b7237c
..
dba9f22
100644
(file)
--- a/
include/asm-ia64/pci.h
+++ b/
include/asm-ia64/pci.h
@@
-47,7
+47,7
@@
pcibios_set_master (struct pci_dev *dev)
}
static inline void
-pcibios_penalize_isa_irq (int irq)
+pcibios_penalize_isa_irq (int irq
, int active
)
{
/* We don't do dynamic PCI IRQ allocation */
}