diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/cris/arch-v32/kernel/irq.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/cris/arch-v32/kernel/irq.c')
| -rw-r--r-- | arch/cris/arch-v32/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c index 57668db25031..b6241198fb98 100644 --- a/arch/cris/arch-v32/kernel/irq.c +++ b/arch/cris/arch-v32/kernel/irq.c | |||
| @@ -336,7 +336,7 @@ int set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest) | |||
| 336 | } | 336 | } |
| 337 | 337 | ||
| 338 | static struct irq_chip crisv32_irq_type = { | 338 | static struct irq_chip crisv32_irq_type = { |
| 339 | .typename = "CRISv32", | 339 | .name = "CRISv32", |
| 340 | .startup = startup_crisv32_irq, | 340 | .startup = startup_crisv32_irq, |
| 341 | .shutdown = shutdown_crisv32_irq, | 341 | .shutdown = shutdown_crisv32_irq, |
| 342 | .enable = enable_crisv32_irq, | 342 | .enable = enable_crisv32_irq, |