tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 70057a5a 343d04d4

+2 -1
+1 -1
drivers/Makefile
··· 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/
+1
drivers/firewire/ohci.c
··· 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