Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[mv-sheeva.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 0861aa554dfd0b74b605eb2f27677d3e295e52ec..167af319cfdfe6430618560444382edec17f91fc 100644 (file)
--- 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/