Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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 14 years ago
parent
343d04d44b 8702d33aa6
commit
70057a5a61
2 changed files with 2 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      drivers/Makefile
  2. 1 0
      drivers/firewire/ohci.c

+ 1 - 1
drivers/Makefile
View File 

@@ -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/

+ 1 - 0
drivers/firewire/ohci.c
View File 

@@ -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},
 
 };