summaryrefslogtreecommitdiff
path: root/arch/ia64/kernel/irq_ia64.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2009-06-17 20:35:24 +0400
committerTony Luck <tony.luck@intel.com>2009-06-17 20:35:24 +0400
commit27f70c3117194f98beb009dc48bb2aa267f505bf (patch)
tree22afa3fb31376da9e37f09a78745afe3f16fde8a /arch/ia64/kernel/irq_ia64.c
parentd186b86ffcad713a1dd3d03e9d4ce2d59f61a1ed (diff)
parente088a4ad7fa53c3dc3c29f930025f41ccf01953e (diff)
downloadlinux-27f70c3117194f98beb009dc48bb2aa267f505bf.tar.xz
Pull for-2.6.31 into release
Diffstat (limited to 'arch/ia64/kernel/irq_ia64.c')
-rw-r--r--arch/ia64/kernel/irq_ia64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index b448197728be..dd9d7b54f1a1 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -630,7 +630,7 @@ static struct irqaction tlb_irqaction = {
void
ia64_native_register_percpu_irq (ia64_vector vec, struct irqaction *action)
{
- irq_desc_t *desc;
+ struct irq_desc *desc;
unsigned int irq;
irq = vec;