diff options
author | Mikael Eriksson | 2017-01-16 10:55:50 +0100 |
---|---|---|
committer | Mikael Eriksson | 2017-01-16 10:55:50 +0100 |
commit | 768273db6c023389c455d9447b7cc05aa12312db (patch) | |
tree | aac75e7438f7b56fe9ebe98023c9162823b07f18 | |
parent | 696cb305f46e499c0afcec001e8696173e614753 (diff) | |
download | aur-768273db6c023389c455d9447b7cc05aa12312db.tar.gz |
Merge configs from 4.9.4-1
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | config | 2 | ||||
-rw-r--r-- | config.x86_64 | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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 @@ -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 |