diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-17 19:54:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-17 19:54:41 -0400 |
| commit | 01a7143586f51f80e1b29ebf240c6e5390657450 (patch) | |
| tree | 3c07d62911d6a0901cc3d4795b90132401b2b8bb | |
| parent | 4be0ed42c56c84d980a851f0bdd0fc20b45c3944 (diff) | |
| parent | f39aa30d7741f40ad964341e9243dbbd7f8ff057 (diff) | |
Merge branch 'fixes' of git://git.user.in-berlin.de/s5r6/linux1394
* 'fixes' of git://git.user.in-berlin.de/s5r6/linux1394:
firewire: ohci: add no MSI quirk for O2Micro controller
| -rw-r--r-- | drivers/firewire/ohci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 57cd3a406edf..fd7170a9ad2c 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
| @@ -290,6 +290,9 @@ static const struct { | |||
| 290 | {PCI_VENDOR_ID_NEC, PCI_ANY_ID, PCI_ANY_ID, | 290 | {PCI_VENDOR_ID_NEC, PCI_ANY_ID, PCI_ANY_ID, |
| 291 | QUIRK_CYCLE_TIMER}, | 291 | QUIRK_CYCLE_TIMER}, |
| 292 | 292 | ||
| 293 | {PCI_VENDOR_ID_O2, PCI_ANY_ID, PCI_ANY_ID, | ||
| 294 | QUIRK_NO_MSI}, | ||
| 295 | |||
| 293 | {PCI_VENDOR_ID_RICOH, PCI_ANY_ID, PCI_ANY_ID, | 296 | {PCI_VENDOR_ID_RICOH, PCI_ANY_ID, PCI_ANY_ID, |
| 294 | QUIRK_CYCLE_TIMER}, | 297 | QUIRK_CYCLE_TIMER}, |
| 295 | 298 | ||