Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
Linus Torvalds [Fri, 17 Sep 2010 17:23:08 +0000 (10:23 -0700)]
* '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

1  2 
drivers/Makefile

diff --combined drivers/Makefile
@@@ -50,7 -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/
@@@ -101,9 -101,7 +101,9 @@@ obj-y                              += firmware
  obj-$(CONFIG_CRYPTO)          += crypto/
  obj-$(CONFIG_SUPERH)          += sh/
  obj-$(CONFIG_ARCH_SHMOBILE)   += sh/
 -obj-$(CONFIG_GENERIC_TIME)    += clocksource/
 +ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
 +obj-y                         += clocksource/
 +endif
  obj-$(CONFIG_DMA_ENGINE)      += dma/
  obj-$(CONFIG_DCA)             += dca/
  obj-$(CONFIG_HID)             += hid/