git.openpandora.org
/
pandora-kernel.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/davej/cpufreq
[pandora-kernel.git]
/
include
/
asm-m68k
/
pci.h
diff --git
a/include/asm-m68k/pci.h
b/include/asm-m68k/pci.h
index
9e7d79a
..
9d2c07a
100644
(file)
--- a/
include/asm-m68k/pci.h
+++ b/
include/asm-m68k/pci.h
@@
-43,7
+43,7
@@
static inline void pcibios_set_master(struct pci_dev *dev)
/* No special bus mastering setup handling */
}
-static inline void pcibios_penalize_isa_irq(int irq)
+static inline void pcibios_penalize_isa_irq(int irq
, int active
)
{
/* We don't do dynamic PCI IRQ allocation */
}