diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-30 12:06:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-30 12:06:15 -0700 |
| commit | 1326af2464fc29290d1710447297d33a90a6ece4 (patch) | |
| tree | d052eeff789e56a83dd881ef6efa809f73e28b43 /drivers/firewire/ohci.c | |
| parent | 24e19d279f9e289e965b4bc4710fbccab824c4c4 (diff) | |
| parent | 2fe2023adf695d08af5b598b2be3b288a95d563c (diff) | |
| download | linux-1326af2464fc29290d1710447297d33a90a6ece4.tar.bz2 | |
Merge tag 'firewire-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull firewire fix from Stefan Richter:
"A regression fix for the IEEE 1394 subsystem: re-enable IRQ-based
asynchronous request reception at addresses below 128 TB"
* tag 'firewire-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
firewire: revert to 4 GB RDMA, fix protocols using Memory Space
Diffstat (limited to 'drivers/firewire/ohci.c')
| -rw-r--r-- | drivers/firewire/ohci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 8db663219560..586f2f7f6993 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -3716,7 +3716,7 @@ static int pci_probe(struct pci_dev *dev, version >> 16, version & 0xff, ohci->card.index, ohci->n_ir, ohci->n_it, ohci->quirks, reg_read(ohci, OHCI1394_PhyUpperBound) ? - ", >4 GB phys DMA" : ""); + ", physUB" : ""); return 0; |