projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/mtd-2.6
[powerpc.git]
/
include
/
asm-sh
/
pci.h
diff --git
a/include/asm-sh/pci.h
b/include/asm-sh/pci.h
index
2604488
..
0a523c8
100644
(file)
--- a/
include/asm-sh/pci.h
+++ b/
include/asm-sh/pci.h
@@
-36,7
+36,7
@@
struct pci_dev;
extern void pcibios_set_master(struct pci_dev *dev);
-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 */
}