Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 70057a5a61a9c703aac0cc51811de8d3384d2889

Authored by Linus Torvalds
2 parents 343d04d44b 8702d33aa6

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: nosy: fix build when CONFIG_FIREWIRE=N
  firewire: ohci: activate cycle timer register quirk on Ricoh chips

Showing 2 changed files Side-by-side Diff

... ... @@ -50,7 +50,7 @@
50 50 obj-y += net/
51 51 obj-$(CONFIG_ATM) += atm/
52 52 obj-$(CONFIG_FUSION) += message/
53   -obj-$(CONFIG_FIREWIRE) += firewire/
  53 +obj-y += firewire/
54 54 obj-y += ieee1394/
55 55 obj-$(CONFIG_UIO) += uio/
56 56 obj-y += cdrom/
drivers/firewire/ohci.c
Diff comments   View file @ 70057a5
... ... @@ -263,6 +263,7 @@
263 263 {PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_FW, QUIRK_NO_MSI},
264 264 {PCI_VENDOR_ID_NEC, PCI_ANY_ID, QUIRK_CYCLE_TIMER},
265 265 {PCI_VENDOR_ID_VIA, PCI_ANY_ID, QUIRK_CYCLE_TIMER},
  266 + {PCI_VENDOR_ID_RICOH, PCI_ANY_ID, QUIRK_CYCLE_TIMER},
266 267 {PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_FW, QUIRK_BE_HEADERS},
267 268 };
268 269