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 /drivers/parisc/eisa.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/parisc/eisa.c')
| -rw-r--r-- | drivers/parisc/eisa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c index 51220749cb65..46f503fb7fc5 100644 --- a/drivers/parisc/eisa.c +++ b/drivers/parisc/eisa.c | |||
| @@ -189,7 +189,7 @@ static unsigned int eisa_startup_irq(unsigned int irq) | |||
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | static struct irq_chip eisa_interrupt_type = { | 191 | static struct irq_chip eisa_interrupt_type = { |
| 192 | .typename = "EISA", | 192 | .name = "EISA", |
| 193 | .startup = eisa_startup_irq, | 193 | .startup = eisa_startup_irq, |
| 194 | .shutdown = eisa_disable_irq, | 194 | .shutdown = eisa_disable_irq, |
| 195 | .enable = eisa_enable_irq, | 195 | .enable = eisa_enable_irq, |