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/davej/cpufreq
[powerpc.git]
/
drivers
/
pnp
/
pnpbios
/
rsparser.c
diff --git
a/drivers/pnp/pnpbios/rsparser.c
b/drivers/pnp/pnpbios/rsparser.c
index
9001b6f
..
e305bb1
100644
(file)
--- a/
drivers/pnp/pnpbios/rsparser.c
+++ b/
drivers/pnp/pnpbios/rsparser.c
@@
-11,7
+11,7
@@
#ifdef CONFIG_PCI
#include <linux/pci.h>
#else
-inline void pcibios_penalize_isa_irq(int irq) {}
+inline void pcibios_penalize_isa_irq(int irq
, int active
) {}
#endif /* CONFIG_PCI */
#include "pnpbios.h"