diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-17 10:23:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-17 10:23:08 -0700 |
| commit | 70057a5a61a9c703aac0cc51811de8d3384d2889 (patch) | |
| tree | dbc78019d3dab85d43baa11fe661e4a3eaeb61a6 | |
| parent | 343d04d44bb069064180f5763a41acaa9245f8e6 (diff) | |
| parent | 8702d33aa6e6d753ef99163afe48aba1323374ef (diff) | |
| download | linux-stable-70057a5a61a9c703aac0cc51811de8d3384d2889.tar.gz linux-stable-70057a5a61a9c703aac0cc51811de8d3384d2889.tar.bz2 linux-stable-70057a5a61a9c703aac0cc51811de8d3384d2889.zip | |
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
| -rw-r--r-- | drivers/Makefile | 2 | ||||
| -rw-r--r-- | drivers/firewire/ohci.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index ae473445ad6d..a2aea53a75ed 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -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/ diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index be29b0bb2471..1b05896648bc 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -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}, }; |