diff --git a/[refs] b/[refs]
index 8b2c91ee34b3..5a3023cd415f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 970f4be85ae6ecf97b711a3a2a1d5cecd3ea0534
+refs/heads/master: 8702d33aa6e6d753ef99163afe48aba1323374ef
diff --git a/trunk/drivers/Makefile b/trunk/drivers/Makefile
index 91874e048552..0bbb4561720e 100644
--- a/trunk/drivers/Makefile
+++ b/trunk/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/