diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-24 14:37:23 -0700 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-24 14:37:23 -0700 |
| commit | 160b13f17c4f92805c4ad03c3336dded15c693e9 (patch) | |
| tree | e5390b0b53c0034e7dc03dcd3ffbfc2180dea39a /drivers/pcmcia/pcmcia_resource.c | |
| parent | c0c3e8edaabcb6cf6786226813cf087ad21f0743 (diff) | |
| parent | 9c2c38a122cc23d6a09b8004d60a33913683eedf (diff) | |
| download | linux-160b13f17c4f92805c4ad03c3336dded15c693e9.tar.gz linux-160b13f17c4f92805c4ad03c3336dded15c693e9.tar.bz2 linux-160b13f17c4f92805c4ad03c3336dded15c693e9.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/pcmcia/pcmcia_resource.c')
| -rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index 6f9fdb276402..599b116d9747 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c @@ -41,6 +41,7 @@ module_param(io_speed, int, 0444); #ifdef CONFIG_PCMCIA_PROBE +#include <asm/irq.h> /* mask of IRQs already reserved by other cards, we should avoid using them */ static u8 pcmcia_used_irq[NR_IRQS]; #endif |