Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01a71435 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4be0ed42 f39aa30d

drivers/firewire/ohci.c

+3 −0
Original line number Diff line number Diff line
@@ -290,6 +290,9 @@ static const struct { 
	{PCI_VENDOR_ID_NEC, PCI_ANY_ID, PCI_ANY_ID,

		QUIRK_CYCLE_TIMER},



	{PCI_VENDOR_ID_O2, PCI_ANY_ID, PCI_ANY_ID,

		QUIRK_NO_MSI},



	{PCI_VENDOR_ID_RICOH, PCI_ANY_ID, PCI_ANY_ID,

		QUIRK_CYCLE_TIMER},