diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
| commit | 17f7f4d9fcce8f1b75b5f735569309dee7665968 (patch) | |
| tree | 14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a /drivers/parisc/dino.c | |
| parent | 041110a439e21cd40709ead4ffbfa8034619ad77 (diff) | |
| parent | d7c1255a3a21e98bdc64df8ccf005a174d7e6289 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/fib_frontend.c
Diffstat (limited to 'drivers/parisc/dino.c')
| -rw-r--r-- | drivers/parisc/dino.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index d9f51485beee..9383063d2b16 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c | |||
| @@ -349,7 +349,6 @@ static struct irq_chip dino_interrupt_type = { | |||
| 349 | .name = "GSC-PCI", | 349 | .name = "GSC-PCI", |
| 350 | .unmask = dino_unmask_irq, | 350 | .unmask = dino_unmask_irq, |
| 351 | .mask = dino_mask_irq, | 351 | .mask = dino_mask_irq, |
| 352 | .ack = no_ack_irq, | ||
| 353 | }; | 352 | }; |
| 354 | 353 | ||
| 355 | 354 | ||