diff options
| author | Linus Torvalds | 2010-09-17 19:23:08 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-09-17 19:23:08 +0200 |
| commit | 70057a5a61a9c703aac0cc51811de8d3384d2889 (patch) | |
| tree | dbc78019d3dab85d43baa11fe661e4a3eaeb61a6 /drivers/Makefile | |
| parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
| parent | firewire: nosy: fix build when CONFIG_FIREWIRE=N (diff) | |
| download | kernel-qcow2-linux-70057a5a61a9c703aac0cc51811de8d3384d2889.tar.gz kernel-qcow2-linux-70057a5a61a9c703aac0cc51811de8d3384d2889.tar.xz kernel-qcow2-linux-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
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 1 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/ |