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
[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...
[pandora-kernel.git]
/
include
/
asm-alpha
/
pci.h
diff --git
a/include/asm-alpha/pci.h
b/include/asm-alpha/pci.h
index
b7806aa
..
2895769
100644
(file)
--- a/
include/asm-alpha/pci.h
+++ b/
include/asm-alpha/pci.h
@@
-58,7
+58,7
@@
struct pci_controller {
extern void pcibios_set_master(struct pci_dev *dev);
-extern inline void pcibios_penalize_isa_irq(int irq)
+extern inline void pcibios_penalize_isa_irq(int irq
, int active
)
{
/* We don't do dynamic PCI IRQ allocation */
}