From 7561a31ed9cdbf194f86bfc6478a4a1a21efbaa8 Mon Sep 17 00:00:00 2001 From: Justin Hibbits Date: Wed, 1 Nov 2017 03:09:16 +0000 Subject: [PATCH] Rename a couple files to not conflict with ZFS filenames Now a kernel can be built with both ZFS and DPAA compiled in. --- sys/contrib/ncsw/Peripherals/FM/{fm.c => fm_ncsw.c} | 0 sys/contrib/ncsw/etc/{list.c => ncsw_list.c} | 0 sys/powerpc/conf/dpaa/files.dpaa | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename sys/contrib/ncsw/Peripherals/FM/{fm.c => fm_ncsw.c} (100%) rename sys/contrib/ncsw/etc/{list.c => ncsw_list.c} (100%) diff --git a/sys/contrib/ncsw/Peripherals/FM/fm.c b/sys/contrib/ncsw/Peripherals/FM/fm_ncsw.c similarity index 100% rename from sys/contrib/ncsw/Peripherals/FM/fm.c rename to sys/contrib/ncsw/Peripherals/FM/fm_ncsw.c diff --git a/sys/contrib/ncsw/etc/list.c b/sys/contrib/ncsw/etc/ncsw_list.c similarity index 100% rename from sys/contrib/ncsw/etc/list.c rename to sys/contrib/ncsw/etc/ncsw_list.c diff --git a/sys/powerpc/conf/dpaa/files.dpaa b/sys/powerpc/conf/dpaa/files.dpaa index db59e6a9065c..ba53da3d54de 100644 --- a/sys/powerpc/conf/dpaa/files.dpaa +++ b/sys/powerpc/conf/dpaa/files.dpaa @@ -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}"