diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
| commit | f0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch) | |
| tree | 2472e94d39f43a9580a6d2d5d92de0b749023263 /drivers/ieee1394/Makefile | |
| parent | 0cfea5dd98205f2fa318836da664a7d7df1afbc1 (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/ieee1394/Makefile')
| -rw-r--r-- | drivers/ieee1394/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ieee1394/Makefile b/drivers/ieee1394/Makefile index 6f53611fe255..d9650d3d77a0 100644 --- a/drivers/ieee1394/Makefile +++ b/drivers/ieee1394/Makefile | |||
| @@ -3,8 +3,11 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \ | 5 | ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \ |
| 6 | highlevel.o csr.o nodemgr.o oui.o dma.o iso.o \ | 6 | highlevel.o csr.o nodemgr.o dma.o iso.o \ |
| 7 | csr1212.o config_roms.o | 7 | csr1212.o config_roms.o |
| 8 | ifdef CONFIG_IEEE1394_OUI_DB | ||
| 9 | ieee1394-objs += oui.o | ||
| 10 | endif | ||
| 8 | 11 | ||
| 9 | obj-$(CONFIG_IEEE1394) += ieee1394.o | 12 | obj-$(CONFIG_IEEE1394) += ieee1394.o |
| 10 | obj-$(CONFIG_IEEE1394_PCILYNX) += pcilynx.o | 13 | obj-$(CONFIG_IEEE1394_PCILYNX) += pcilynx.o |