summaryrefslogtreecommitdiff
path: root/WHENCE
diff options
context:
space:
mode:
authorAnusha Srivatsa <anusha.srivatsa@intel.com>2018-08-27 10:29:07 -0700
committerAnusha Srivatsa <anusha.srivatsa@intel.com>2018-08-27 10:29:07 -0700
commit976981cc34b695fa86e55f74c95a5baacfcf7edc (patch)
treefed4107d9260a20c80ea4bee386819348770103c /WHENCE
parent1e54a19c7a2c300aabb9ca69901dd94b1f6e5b70 (diff)
Revert "firmware/icl/dmc: Add DMC v1.05 for Icelake."
We have a new version of DMC now. This reverts commit 57ffda274ed80b057f6d1e2a84a9a866b2d52b7d.
Diffstat (limited to 'WHENCE')
-rw-r--r--WHENCE3
1 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
--------------------------------------------------------------------------