diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-02-19 14:45:23 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-19 14:45:23 +1100 |
commit | e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1 (patch) | |
tree | 643566bbcf1312cd9ae1fed9e235d702c7281a8f /source4/ntvfs/posix/config.mk | |
parent | 5842df9d0fb71430d1bcda1c4c748589b38ecb00 (diff) | |
parent | 9368ea67cdbb0d1fe5ef2258cc7e8c20c66e6ecd (diff) | |
download | samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.tar.gz samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.tar.bz2 samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.zip |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 837eb8a0bc011cd84bc7e8d2849028313d709928)
Diffstat (limited to 'source4/ntvfs/posix/config.mk')
-rw-r--r-- | source4/ntvfs/posix/config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk index 6588be11ae..6879940337 100644 --- a/source4/ntvfs/posix/config.mk +++ b/source4/ntvfs/posix/config.mk @@ -31,7 +31,7 @@ PRIVATE_DEPENDENCIES = LIBAIO_LINUX # Start MODULE ntvfs_posix [MODULE::ntvfs_posix] SUBSYSTEM = ntvfs -OUTPUT_TYPE = INTEGRATED +OUTPUT_TYPE = MERGED_OBJ INIT_FUNCTION = ntvfs_posix_init PRIVATE_PROTO_HEADER = vfs_posix_proto.h OBJ_FILES = \ |