summaryrefslogtreecommitdiff
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-29 19:10:39 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-29 19:10:39 -0400
commit739cdbf1d8f0739b80035b80d69d871e33749b86 (patch)
tree15134df8723ab7d7a5524c99070f02d5739bad0d /drivers/pcmcia
parent83bbecc905b3431c60fe282830e09aaaab97b26a (diff)
parent8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff)
downloadlwn-739cdbf1d8f0739b80035b80d69d871e33749b86.tar.gz
lwn-739cdbf1d8f0739b80035b80d69d871e33749b86.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/pcmcia_resource.c1
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