diff --git a/[refs] b/[refs]
index 383b9b1e8f91..77a25f0a5891 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f5880394c8ab01854c0cba288352a1a77d5ea82
+refs/heads/master: def4d8733b8b8fed521957a7fd546714dd491b91
diff --git a/trunk/drivers/ieee1394/Makefile b/trunk/drivers/ieee1394/Makefile
index 6f53611fe255..d9650d3d77a0 100644
--- a/trunk/drivers/ieee1394/Makefile
+++ b/trunk/drivers/ieee1394/Makefile
@@ -3,8 +3,11 @@
 #
 
 ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \
-		 highlevel.o csr.o nodemgr.o oui.o dma.o iso.o \
+		 highlevel.o csr.o nodemgr.o dma.o iso.o \
 		 csr1212.o config_roms.o
+ifdef CONFIG_IEEE1394_OUI_DB
+ieee1394-objs += oui.o
+endif
 
 obj-$(CONFIG_IEEE1394) += ieee1394.o
 obj-$(CONFIG_IEEE1394_PCILYNX) += pcilynx.o