summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--WHENCE3
-rw-r--r--i915/icl_dmc_ver1_05.binbin25836 -> 0 bytes
2 files changed, 3 insertions, 0 deletions
diff --git a/WHENCE b/WHENCE
index d27f864b..67924874 100644
--- a/WHENCE
+++ b/WHENCE
@@ -3630,11 +3630,14 @@ Version: DMC API/ABI ver 1 - release 06 for Cannonlake
File: i915/cnl_dmc_ver1_07.bin
Version: DMC API/ABI ver 1 - release 07 for Cannonlake
+<<<<<<< HEAD
File: i915/icl_dmc_ver1_05.bin
Version: DMC API/ABI ver 1 - release 05 for Icelake
File: i915/icl_dmc_ver1_07.bin
Version: DMC API/ABI ver 1 - release 07 for Icelake
+=======
+>>>>>>> parent of 57ffda2... firmware/icl/dmc: Add DMC v1.05 for Icelake.
License: Redistributable. See LICENSE.i915 for details
--------------------------------------------------------------------------
diff --git a/i915/icl_dmc_ver1_05.bin b/i915/icl_dmc_ver1_05.bin
deleted file mode 100644
index 420a3e94..00000000
--- a/i915/icl_dmc_ver1_05.bin
+++ /dev/null
Binary files differ