From bd5604bba7ef2487c4559f7e46ec5384885e1b2f Mon Sep 17 00:00:00 2001 From: Antony Clince Alex Date: Mon, 20 Jan 2020 15:03:41 +0530 Subject: [PATCH] nvgpu: userspace: make channel-devctl visible to SWUTS Add reference link to channel-devctl in SWUTS. Fix unresolved merge conflict which managed to sneak into the branch. Jira: NVGPU-4827 Change-Id: I99ba52603412ad3d4cb467e1dbdd6bbc5b31c344 Signed-off-by: Antony Clince Alex Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2282371 Tested-by: mobile promotions Reviewed-by: mobile promotions --- userspace/SWUTS.h | 1 + userspace/SWUTS.sources | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/userspace/SWUTS.h b/userspace/SWUTS.h index 45a3407ad..407059465 100644 --- a/userspace/SWUTS.h +++ b/userspace/SWUTS.h @@ -139,6 +139,7 @@ * - @ref SWUTS-gr-obj-ctx * - @ref SWUTS-gr-config * - @ref SWUTS-ecc + * - @ref SWUTS-channel_devctl_qnx * */ diff --git a/userspace/SWUTS.sources b/userspace/SWUTS.sources index caead8e26..d13ccb45a 100644 --- a/userspace/SWUTS.sources +++ b/userspace/SWUTS.sources @@ -1,9 +1,6 @@ INPUT += ../../../userspace/SWUTS.h -<<<<<<< d9538d12c25f23f90bfb5978be79cdc4ff69f114 INPUT += ../../../userspace/units/ce/nvgpu-ce.h INPUT += ../../../userspace/units/cg/nvgpu-cg.h -======= ->>>>>>> gpu: nvgpu: unit: improve coverage for engines INPUT += ../../../userspace/units/enabled/nvgpu-enabled.h INPUT += ../../../userspace/units/interface/bit-utils/bit-utils.h INPUT += ../../../userspace/units/interface/bsearch/bsearch.h