diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /drivers/pnp | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/isapnp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/pnp/isapnp.c b/drivers/pnp/isapnp.c index ffd440dc3..45f7f05f1 100644 --- a/drivers/pnp/isapnp.c +++ b/drivers/pnp/isapnp.c @@ -48,14 +48,14 @@ LIST_HEAD(isapnp_devices); #define ISAPNP_DEBUG #endif -struct resource *pidxr_res = NULL; -struct resource *pnpwrp_res = NULL; -struct resource *isapnp_rdp_res = NULL; +struct resource *pidxr_res; +struct resource *pnpwrp_res; +struct resource *isapnp_rdp_res; -int isapnp_disable = 0; /* Disable ISA PnP */ -int isapnp_rdp = 0; /* Read Data Port */ +int isapnp_disable; /* Disable ISA PnP */ +int isapnp_rdp; /* Read Data Port */ int isapnp_reset = 1; /* reset all PnP cards (deactivate) */ -int isapnp_skip_pci_scan = 0; /* skip PCI resource scanning */ +int isapnp_skip_pci_scan; /* skip PCI resource scanning */ int isapnp_verbose = 1; /* verbose mode */ int isapnp_reserve_irq[16] = { [0 ... 15] = -1 }; /* reserve (don't use) some IRQ */ int isapnp_reserve_dma[8] = { [0 ... 7] = -1 }; /* reserve (don't use) some DMA */ @@ -108,7 +108,7 @@ MODULE_PARM_DESC(isapnp_reserve_mem, "ISA Plug & Play - reserve memory region(s) static unsigned char isapnp_checksum_value; static DECLARE_MUTEX(isapnp_cfg_mutex); -static int isapnp_detected = 0; +static int isapnp_detected; /* some prototypes */ @@ -529,7 +529,7 @@ static void __init isapnp_add_irq_resource(struct pci_dev *dev, (*res)->irq = irq; #ifdef CONFIG_PCI for (i=0; i<16; i++) - if (irq->map & i) + if (irq->map & (1<<i)) pcibios_penalize_isa_irq(i); #endif } |