diff options
author | Russell King | 2005-07-28 10:30:20 +0200 |
---|---|---|
committer | Russell King | 2005-07-28 10:30:20 +0200 |
commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
tree | 765512576314fc3612b503f182b9ae4e60fcf849 /drivers/pnp | |
parent | [SERIAL] Convert parport_serial to use new 8250_pci interfaces (diff) | |
parent | [PATCH] new alpha syscalls (diff) | |
download | kernel-qcow2-linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.gz kernel-qcow2-linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.xz kernel-qcow2-linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.zip |
Merge with Linus' 2.6 tree
Diffstat (limited to 'drivers/pnp')
-rw-r--r-- | drivers/pnp/pnpbios/rsparser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c index 9001b6f0204d..e305bb132c24 100644 --- 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" |