summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Eriksson2017-01-16 10:55:50 +0100
committerMikael Eriksson2017-01-16 10:55:50 +0100
commit768273db6c023389c455d9447b7cc05aa12312db (patch)
treeaac75e7438f7b56fe9ebe98023c9162823b07f18
parent696cb305f46e499c0afcec001e8696173e614753 (diff)
downloadaur-768273db6c023389c455d9447b7cc05aa12312db.tar.gz
Merge configs from 4.9.4-1
-rw-r--r--.SRCINFO2
-rw-r--r--config2
-rw-r--r--config.x86_642
3 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f55caf461807..8294d8e74f7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Jan 9 10:02:13 UTC 2017
+# Mon Jan 16 09:55:50 UTC 2017
pkgbase = linux-mainline
pkgver = 4.10rc3
pkgrel = 1
diff --git a/config b/config
index de472a7ca42d..ddbf86c8b855 100644
--- a/config
+++ b/config
@@ -5124,7 +5124,7 @@ CONFIG_DRM_RADEON=m
# CONFIG_DRM_RADEON_USERPTR is not set
CONFIG_DRM_AMDGPU=m
CONFIG_DRM_AMDGPU_SI=y
-# CONFIG_DRM_AMDGPU_CIK is not set
+CONFIG_DRM_AMDGPU_CIK=y
CONFIG_DRM_AMDGPU_USERPTR=y
# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
diff --git a/config.x86_64 b/config.x86_64
index 32921fd67ad6..82a4547e8e1d 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -4974,7 +4974,7 @@ CONFIG_DRM_RADEON=m
# CONFIG_DRM_RADEON_USERPTR is not set
CONFIG_DRM_AMDGPU=m
CONFIG_DRM_AMDGPU_SI=y
-# CONFIG_DRM_AMDGPU_CIK is not set
+CONFIG_DRM_AMDGPU_CIK=y
CONFIG_DRM_AMDGPU_USERPTR=y
# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set