[linux] 01/04: [x86] drm: Enable DRM_AMDGPU as module

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit a73815e36d42c43a32602e228047d9a18566f110
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Oct 16 03:07:28 2015 +0100

    [x86] drm: Enable DRM_AMDGPU as module
---
 debian/changelog                    | 4 ++++
 debian/config/kernelarch-x86/config | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c2b93ec..4ddbc3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 linux (4.2.3-3) UNRELEASED; urgency=medium
 
+  [ Salvatore Bonaccorso ]
   * KEYS: Fix race between key destruction and finding a keyring by name
   * KEYS: Fix crash when attempt to garbage collect an uninstantiated keyring
   * KEYS: Don't permit request_key() to construct a new keyring
 
+  [ Ben Hutchings ]
+  * [x86] drm: Enable DRM_AMDGPU as module
+
  -- Salvatore Bonaccorso <carnil at debian.org>  Mon, 19 Oct 2015 21:23:18 +0200
 
 linux (4.2.3-2) unstable; urgency=medium
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 58c9be3..6e6febb 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -471,11 +471,18 @@ CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
+CONFIG_DRM_AMDGPU=m
 # CONFIG_DRM_I810 is not set
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 
 ##
+## file: drivers/gpu/drm/amd/amdgpu/Kconfig
+##
+# CONFIG_DRM_AMDGPU_CIK is not set
+CONFIG_DRM_AMDGPU_USERPTR=y
+
+##
 ## file: drivers/gpu/drm/ast/Kconfig
 ##
 CONFIG_DRM_AST=m

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git