aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2016-03-31 18:18:28 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-08-08 11:33:29 -0400
commitfdba11f4079ec0b3037a0e3ce6014b47135db431 (patch)
tree915d2be1b77a5abdec932b055b6bbfd52ede78d2
parentfad2af195f1abaada473f4f9e9a554c1e4db768b (diff)
drm/amdgpu: move all Kconfig options to amdgpu/Kconfig
For consistency. Reviewed-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/Kconfig3
-rw-r--r--drivers/gpu/drm/amd/amdgpu/Kconfig2
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index fc357319de35..64f2a448a137 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -171,9 +171,6 @@ config DRM_AMDGPU
171 If M is selected, the module will be called amdgpu. 171 If M is selected, the module will be called amdgpu.
172 172
173source "drivers/gpu/drm/amd/amdgpu/Kconfig" 173source "drivers/gpu/drm/amd/amdgpu/Kconfig"
174source "drivers/gpu/drm/amd/powerplay/Kconfig"
175
176source "drivers/gpu/drm/amd/acp/Kconfig"
177 174
178source "drivers/gpu/drm/nouveau/Kconfig" 175source "drivers/gpu/drm/nouveau/Kconfig"
179 176
diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig
index 7335c0420c70..f3cb69de0c44 100644
--- a/drivers/gpu/drm/amd/amdgpu/Kconfig
+++ b/drivers/gpu/drm/amd/amdgpu/Kconfig
@@ -25,3 +25,5 @@ config DRM_AMDGPU_GART_DEBUGFS
25 Selecting this option creates a debugfs file to inspect the mapped 25 Selecting this option creates a debugfs file to inspect the mapped
26 pages. Uses more memory for housekeeping, enable only for debugging. 26 pages. Uses more memory for housekeeping, enable only for debugging.
27 27
28source "drivers/gpu/drm/amd/powerplay/Kconfig"
29source "drivers/gpu/drm/amd/acp/Kconfig"