d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename a couple files to not conflict with ZFS filenames

Browse Source 
Now a kernel can be built with both ZFS and DPAA compiled in.
This commit is contained in:
Justin Hibbits 2017-11-01 03:09:16 +00:00
parent 8ccebb4435
commit 7561a31ed9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=325260
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sys/contrib/ncsw/Peripherals/FM/fm.c → sys/contrib/ncsw/Peripherals/FM/fm_ncsw.c
View File

0
sys/contrib/ncsw/etc/list.c → sys/contrib/ncsw/etc/ncsw_list.c
View File

4
sys/powerpc/conf/dpaa/files.dpaa
View File

@ -3,7 +3,7 @@
# NetCommSw drivers
contrib/ncsw/etc/error.c optional dpaa \
no-depend compile-with "${DPAA_COMPILE_CMD}"
contrib/ncsw/etc/list.c optional dpaa \
contrib/ncsw/etc/ncsw_list.c optional dpaa \
no-depend compile-with "${DPAA_COMPILE_CMD}"
contrib/ncsw/etc/memcpy.c optional dpaa \
no-depend compile-with "${DPAA_COMPILE_CMD}"
@ -71,7 +71,7 @@ contrib/ncsw/Peripherals/FM/HC/hc.c optional dpaa \
no-depend compile-with "${DPAA_COMPILE_CMD}"
contrib/ncsw/Peripherals/FM/fm_muram.c optional dpaa \
no-depend compile-with "${DPAA_COMPILE_CMD}"
contrib/ncsw/Peripherals/FM/fm.c optional dpaa \
contrib/ncsw/Peripherals/FM/fm_ncsw.c optional dpaa \
no-depend compile-with "${DPAA_COMPILE_CMD}"
contrib/ncsw/Peripherals/FM/fman_ncsw.c optional dpaa \
no-depend compile-with "${DPAA_COMPILE_CMD}"