Merge ../linux-2.6-watchdog-mm

[linux-2.6-omap-h63xx.git] / drivers / ieee1394 / Makefile

diff --git a/drivers/ieee1394/Makefile b/drivers/ieee1394/Makefile
index 6f53611fe255dab1e8fd9da548eb990e067ba427..d9650d3d77a004b383637217db95d21e8f46a164 100644 (file)
--- a/drivers/ieee1394/Makefile
+++ b/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