Commit 70057a5a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 343d04d4 8702d33a

drivers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ obj-$(CONFIG_SPI) += spi/ 
obj-y				+= net/

obj-$(CONFIG_ATM)		+= atm/

obj-$(CONFIG_FUSION)		+= message/

obj-$(CONFIG_FIREWIRE)		+= firewire/

obj-y				+= firewire/

obj-y				+= ieee1394/

obj-$(CONFIG_UIO)		+= uio/

obj-y				+= cdrom/

drivers/firewire/ohci.c

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ static const struct { 
	{PCI_VENDOR_ID_JMICRON,	PCI_DEVICE_ID_JMICRON_JMB38X_FW, QUIRK_NO_MSI},

	{PCI_VENDOR_ID_NEC,	PCI_ANY_ID,	QUIRK_CYCLE_TIMER},

	{PCI_VENDOR_ID_VIA,	PCI_ANY_ID,	QUIRK_CYCLE_TIMER},

	{PCI_VENDOR_ID_RICOH,	PCI_ANY_ID,	QUIRK_CYCLE_TIMER},

	{PCI_VENDOR_ID_APPLE,	PCI_DEVICE_ID_APPLE_UNI_N_FW, QUIRK_BE_HEADERS},

};