diff options
| author | Renato Botelho <renato@netgate.com> | 2016-01-07 18:08:08 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-01-07 18:08:08 -0200 |
| commit | 7a579754077b3460c9509c75cdd1b78769c1db3f (patch) | |
| tree | c15015685ccb82b7db1ac19d663a3c6e41e64587 /sys/modules/zfs/Makefile | |
| parent | d8ff3484131f428fcc0727cd504acb5050a36490 (diff) | |
| parent | bc6ee646001a22150936ff06bf11cd08195e208d (diff) | |
| download | FreeBSD-src-7a579754077b3460c9509c75cdd1b78769c1db3f.zip FreeBSD-src-7a579754077b3460c9509c75cdd1b78769c1db3f.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/modules/zfs/Makefile')
| -rw-r--r-- | sys/modules/zfs/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 5c363f9..53e8d34 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -17,9 +17,9 @@ SRCS+= acl_common.c .PATH: ${SUNW}/common/avl SRCS+= avl.c .PATH: ${SUNW}/common/nvpair -SRCS+= nvpair.c -SRCS+= nvpair_alloc_fixed.c -SRCS+= fnvpair.c +SRCS+= opensolaris_nvpair.c +SRCS+= opensolaris_nvpair_alloc_fixed.c +SRCS+= opensolaris_fnvpair.c .PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/unicode SRCS+= u8_textprep.c |
