diff options
author | Tony Luck <tony.luck@intel.com> | 2009-06-17 12:35:24 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 12:35:24 -0400 |
commit | 27f70c3117194f98beb009dc48bb2aa267f505bf (patch) | |
tree | 22afa3fb31376da9e37f09a78745afe3f16fde8a /arch/ia64/kernel/irq_lsapic.c | |
parent | d186b86ffcad713a1dd3d03e9d4ce2d59f61a1ed (diff) | |
parent | e088a4ad7fa53c3dc3c29f930025f41ccf01953e (diff) |
Pull for-2.6.31 into release
Diffstat (limited to 'arch/ia64/kernel/irq_lsapic.c')
-rw-r--r-- | arch/ia64/kernel/irq_lsapic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/irq_lsapic.c b/arch/ia64/kernel/irq_lsapic.c index e56a7a36aca3..fc1549d4564d 100644 --- a/arch/ia64/kernel/irq_lsapic.c +++ b/arch/ia64/kernel/irq_lsapic.c | |||
@@ -33,7 +33,7 @@ static int lsapic_retrigger(unsigned int irq) | |||
33 | return 1; | 33 | return 1; |
34 | } | 34 | } |
35 | 35 | ||
36 | struct hw_interrupt_type irq_type_ia64_lsapic = { | 36 | struct irq_chip irq_type_ia64_lsapic = { |
37 | .name = "LSAPIC", | 37 | .name = "LSAPIC", |
38 | .startup = lsapic_noop_startup, | 38 | .startup = lsapic_noop_startup, |
39 | .shutdown = lsapic_noop, | 39 | .shutdown = lsapic_noop, |