diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-28 16:03:36 +0200 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-28 16:03:36 +0200 |
| commit | da28c12089dfcfb8695b6b555cdb8e03dda2b690 (patch) | |
| tree | b3ff509f21352ef053cb3d490cb13528090d32ac /drivers/pnp/pnpbios/rsparser.c | |
| parent | Merge with /home/shaggy/git/linus-clean/ (diff) | |
| parent | [PATCH] More qla2xxx configuration fixes (diff) | |
| download | linux-da28c12089dfcfb8695b6b555cdb8e03dda2b690.tar.xz linux-da28c12089dfcfb8695b6b555cdb8e03dda2b690.zip | |
Merge with /home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'drivers/pnp/pnpbios/rsparser.c')
| -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" |