[7/9] drm/amdgpu: Drop unnecessary #include <linux/vga_switcheroo.h>
diff mbox

Message ID 7c96fdc0879eb95e39fa408396b6c81df89c54a4.1444663039.git.lukas@wunner.de
State New
Headers show

Commit Message

Lukas Wunner Oct. 12, 2015, 9:54 a.m. UTC
This was added to two radeon files even though they don't use any
vga_switcheroo symbols, the amdgpu fork inherited them:

Added to amdgpu_acpi.c by commit d7a2952f1ade ("drm/radeon: Add
support for the ATIF ACPI method to the radeon driver").

Added to amdgpu_bios.c by commit 6a9ee8af344e ("vga_switcheroo:
initial implementation (v15)").

Signed-off-by: Lukas Wunner <lukas@wunner.de>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 1 -
 2 files changed, 2 deletions(-)

Comments

Alex Deucher Oct. 12, 2015, 4:27 p.m. UTC | #1
On Mon, Oct 12, 2015 at 5:54 AM, Lukas Wunner <lukas@wunner.de> wrote:
> This was added to two radeon files even though they don't use any
> vga_switcheroo symbols, the amdgpu fork inherited them:
>
> Added to amdgpu_acpi.c by commit d7a2952f1ade ("drm/radeon: Add
> support for the ATIF ACPI method to the radeon driver").
>
> Added to amdgpu_bios.c by commit 6a9ee8af344e ("vga_switcheroo:
> initial implementation (v15)").
>
> Signed-off-by: Lukas Wunner <lukas@wunner.de>

Applied 6 and 7.  thanks!

Alex


> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 1 -
>  drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 1 -
>  2 files changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
> index aef4a7a..a142d5a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
> @@ -25,7 +25,6 @@
>  #include <linux/acpi.h>
>  #include <linux/slab.h>
>  #include <linux/power_supply.h>
> -#include <linux/vga_switcheroo.h>
>  #include <acpi/video.h>
>  #include <drm/drmP.h>
>  #include <drm/drm_crtc_helper.h>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
> index 02add0a..c44c0c6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
> @@ -29,7 +29,6 @@
>  #include "amdgpu.h"
>  #include "atom.h"
>
> -#include <linux/vga_switcheroo.h>
>  #include <linux/slab.h>
>  #include <linux/acpi.h>
>  /*
> --
> 1.8.5.2 (Apple Git-48)
>

Patch
diff mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
index aef4a7a..a142d5a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
@@ -25,7 +25,6 @@ 
 #include <linux/acpi.h>
 #include <linux/slab.h>
 #include <linux/power_supply.h>
-#include <linux/vga_switcheroo.h>
 #include <acpi/video.h>
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
index 02add0a..c44c0c6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
@@ -29,7 +29,6 @@ 
 #include "amdgpu.h"
 #include "atom.h"
 
-#include <linux/vga_switcheroo.h>
 #include <linux/slab.h>
 #include <linux/acpi.h>
 /*