diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /drivers/pnp/pnpbios/rsparser.c | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
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 @@ | |||
| 11 | #ifdef CONFIG_PCI | 11 | #ifdef CONFIG_PCI |
| 12 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
| 13 | #else | 13 | #else |
| 14 | inline void pcibios_penalize_isa_irq(int irq) {} | 14 | inline void pcibios_penalize_isa_irq(int irq, int active) {} |
| 15 | #endif /* CONFIG_PCI */ | 15 | #endif /* CONFIG_PCI */ |
| 16 | 16 | ||
| 17 | #include "pnpbios.h" | 17 | #include "pnpbios.h" |