git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
pnp
/
resource.c
diff --git
a/drivers/pnp/resource.c
b/drivers/pnp/resource.c
index
80a6979
..
3fc9f6c
100644
(file)
--- a/
drivers/pnp/resource.c
+++ b/
drivers/pnp/resource.c
@@
-101,8
+101,8
@@
int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data)
{
int i;
{
int i;
- for (i
= 0; i <
16; i++)
- if (
test_bit(i, data->map
))
+ for (i
=0; i<
16; i++)
+ if (
data->map & (1<<i
))
pcibios_penalize_isa_irq(i);
}
#endif
pcibios_penalize_isa_irq(i);
}
#endif
@@
-421,7
+421,6
@@
int pnp_check_irq(struct pnp_dev * dev, int idx)
int pnp_check_dma(struct pnp_dev * dev, int idx)
{
int pnp_check_dma(struct pnp_dev * dev, int idx)
{
-#ifndef CONFIG_IA64
int tmp;
struct pnp_dev *tdev;
unsigned long * dma = &dev->res.dma_resource[idx].start;
int tmp;
struct pnp_dev *tdev;
unsigned long * dma = &dev->res.dma_resource[idx].start;
@@
-471,10
+470,6
@@
int pnp_check_dma(struct pnp_dev * dev, int idx)
}
return 1;
}
return 1;
-#else
- /* IA64 hasn't legacy DMA */
- return 0;
-#endif
}
}