diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-25 11:23:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-25 11:23:37 -0700 |
| commit | a37f6b84c4f3d3ca61634a7b36bf64c6ea452271 (patch) | |
| tree | 308105401c7c60f91903d6da78c938f1cc74578f /drivers/ide/cs5520.c | |
| parent | 9d73777e500929b71dcfed16eec05f6760e345a6 (diff) | |
| parent | d7e2f36d9a92284754ed5254562766cb3d61c7ca (diff) | |
| download | kernel-crypto-a37f6b84c4f3d3ca61634a7b36bf64c6ea452271.tar.gz kernel-crypto-a37f6b84c4f3d3ca61634a7b36bf64c6ea452271.tar.xz kernel-crypto-a37f6b84c4f3d3ca61634a7b36bf64c6ea452271.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide cs5520: Initialize second port's interrupt number.
ide: improve handling of Power Management requests
ide: add QUANTUM FIREBALLct20 30 with firmware APL.090 to ivb_list[]
ide: relax DMA info validity checking
ide-cd: Improve "weird block size" error message
ide-cd: Don't warn on bogus block size unless it actually matters.
ide: fix handling of unexpected IRQs vs request_irq()
Diffstat (limited to 'drivers/ide/cs5520.c')
| -rw-r--r-- | drivers/ide/cs5520.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c index bd066bb9d61..09f98ed0731 100644 --- a/drivers/ide/cs5520.c +++ b/drivers/ide/cs5520.c @@ -135,6 +135,7 @@ static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_devic ide_pci_setup_ports(dev, d, &hw[0], &hws[0]); hw[0].irq = 14; + hw[1].irq = 15; return ide_host_add(d, hws, 2, NULL); } |