diff options
author | David Howells <dhowells@redhat.com> | 2012-10-02 18:01:05 +0100 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2012-10-02 18:01:05 +0100 |
commit | 4126d5d61f8466be3f76c1bc4e16d46eb2c9641b (patch) | |
tree | 1a16f733e107605c5662150979185770676d4711 /drivers/gpu/drm/radeon | |
parent | 19218e482d3f023166b26143c1a1c6d166a30415 (diff) | |
download | linux-3.10-4126d5d61f8466be3f76c1bc4e16d46eb2c9641b.tar.gz linux-3.10-4126d5d61f8466be3f76c1bc4e16d46eb2c9641b.tar.bz2 linux-3.10-4126d5d61f8466be3f76c1bc4e16d46eb2c9641b.zip |
UAPI: (Scripted) Remove redundant DRM UAPI header #inclusions from drivers/gpu/.
Remove redundant DRM UAPI header #inclusions from drivers/gpu/.
Remove redundant #inclusions of core DRM UAPI headers (drm.h, drm_mode.h and
drm_sarea.h). They are now #included via drmP.h and drm_crtc.h via a preceding
patch.
Without this patch and the patch to make include the UAPI headers from the core
headers, after the UAPI split, the DRM C sources cannot find these UAPI headers
because the DRM code relies on specific -I flags to make #include "..." work
on headers in include/drm/ - but that does not work after the UAPI split without
adding more -I flags.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon')
23 files changed, 0 insertions, 26 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_blit_kms.c b/drivers/gpu/drm/radeon/evergreen_blit_kms.c index 89cb9feb565..820c1f3945d 100644 --- a/drivers/gpu/drm/radeon/evergreen_blit_kms.c +++ b/drivers/gpu/drm/radeon/evergreen_blit_kms.c @@ -25,7 +25,6 @@ */ #include "drmP.h" -#include "drm.h" #include "radeon_drm.h" #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 8d7e33a0b24..cda72de0d73 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -28,7 +28,6 @@ #include <linux/seq_file.h> #include <linux/slab.h> #include "drmP.h" -#include "drm.h" #include "radeon_drm.h" #include "radeon_reg.h" #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c index f0889259eb0..05bb612267b 100644 --- a/drivers/gpu/drm/radeon/r200.c +++ b/drivers/gpu/drm/radeon/r200.c @@ -26,7 +26,6 @@ * Jerome Glisse */ #include "drmP.h" -#include "drm.h" #include "radeon_drm.h" #include "radeon_reg.h" #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c index 1fe98b421c9..535d11a8e83 100644 --- a/drivers/gpu/drm/radeon/r300_cmdbuf.c +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c @@ -32,7 +32,6 @@ */ #include "drmP.h" -#include "drm.h" #include "drm_buffer.h" #include "radeon_drm.h" #include "radeon_drv.h" diff --git a/drivers/gpu/drm/radeon/r600_blit.c b/drivers/gpu/drm/radeon/r600_blit.c index 3c031a48205..689a631f980 100644 --- a/drivers/gpu/drm/radeon/r600_blit.c +++ b/drivers/gpu/drm/radeon/r600_blit.c @@ -24,7 +24,6 @@ * Alex Deucher <alexander.deucher@amd.com> */ #include "drmP.h" -#include "drm.h" #include "radeon_drm.h" #include "radeon_drv.h" diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c index 2bef8549ddf..5ab2106952d 100644 --- a/drivers/gpu/drm/radeon/r600_blit_kms.c +++ b/drivers/gpu/drm/radeon/r600_blit_kms.c @@ -24,7 +24,6 @@ */ #include "drmP.h" -#include "drm.h" #include "radeon_drm.h" #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c index 75ed17c9611..44376bbcc2b 100644 --- a/drivers/gpu/drm/radeon/r600_cp.c +++ b/drivers/gpu/drm/radeon/r600_cp.c @@ -29,7 +29,6 @@ #include <linux/module.h> #include "drmP.h" -#include "drm.h" #include "radeon_drm.h" #include "radeon_drv.h" diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/radeon_acpi.c index 3516a6081dc..bbe3e251370 100644 --- a/drivers/gpu/drm/radeon/radeon_acpi.c +++ b/drivers/gpu/drm/radeon/radeon_acpi.c @@ -5,8 +5,6 @@ #include <acpi/acpi_bus.h> #include "drmP.h" -#include "drm.h" -#include "drm_sarea.h" #include "drm_crtc_helper.h" #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/radeon_agp.c b/drivers/gpu/drm/radeon/radeon_agp.c index bd2f33e5c91..6ecd6f68e76 100644 --- a/drivers/gpu/drm/radeon/radeon_agp.c +++ b/drivers/gpu/drm/radeon/radeon_agp.c @@ -25,7 +25,6 @@ * Jerome Glisse <glisse@freedesktop.org> */ #include "drmP.h" -#include "drm.h" #include "radeon.h" #include "radeon_drm.h" diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index ef67e181377..0c6f0c34bfb 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c @@ -32,8 +32,6 @@ #include <linux/module.h> #include "drmP.h" -#include "drm.h" -#include "drm_sarea.h" #include "radeon_drm.h" #include "radeon_drv.h" #include "r300_reg.h" diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 8c593ea82c4..204a878f4cd 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -30,7 +30,6 @@ */ #include "drmP.h" -#include "drm.h" #include "radeon_drm.h" #include "radeon_drv.h" diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index 5906914a78b..36a412cc232 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c @@ -28,7 +28,6 @@ #include <linux/fb.h> #include "drmP.h" -#include "drm.h" #include "drm_crtc.h" #include "drm_crtc_helper.h" #include "radeon_drm.h" diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c index 2a59375dbe5..f1f67e3929a 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c @@ -35,7 +35,6 @@ #include <linux/kref.h> #include <linux/slab.h> #include "drmP.h" -#include "drm.h" #include "radeon_reg.h" #include "radeon.h" #include "radeon_trace.h" diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index 1b57b0058ad..7b21b630bc1 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -26,7 +26,6 @@ * Jerome Glisse */ #include "drmP.h" -#include "drm.h" #include "radeon_drm.h" #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c index 48b7cea31e0..5f2f401921e 100644 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c @@ -30,7 +30,6 @@ #include <linux/compat.h> #include "drmP.h" -#include "drm.h" #include "radeon_drm.h" #include "radeon_drv.h" diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c index 00da38424df..9d0f1a9df08 100644 --- a/drivers/gpu/drm/radeon/radeon_irq.c +++ b/drivers/gpu/drm/radeon/radeon_irq.c @@ -31,7 +31,6 @@ */ #include "drmP.h" -#include "drm.h" #include "radeon_drm.h" #include "radeon_drv.h" diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 414b4acf694..2d45244ef64 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -26,7 +26,6 @@ * Jerome Glisse */ #include "drmP.h" -#include "drm_sarea.h" #include "radeon.h" #include "radeon_drm.h" #include "radeon_asic.h" diff --git a/drivers/gpu/drm/radeon/radeon_mem.c b/drivers/gpu/drm/radeon/radeon_mem.c index 988548efea9..64f59a03eb5 100644 --- a/drivers/gpu/drm/radeon/radeon_mem.c +++ b/drivers/gpu/drm/radeon/radeon_mem.c @@ -30,7 +30,6 @@ */ #include "drmP.h" -#include "drm.h" #include "radeon_drm.h" #include "radeon_drv.h" diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index d56978949f3..c34078fb850 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -31,7 +31,6 @@ #define RADEON_MODE_H #include <drm_crtc.h> -#include <drm_mode.h> #include <drm_edid.h> #include <drm_dp_helper.h> #include <drm_fixed.h> diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c index 6bef46ace83..a8cd2d538de 100644 --- a/drivers/gpu/drm/radeon/radeon_prime.c +++ b/drivers/gpu/drm/radeon/radeon_prime.c @@ -24,7 +24,6 @@ * Authors: Alex Deucher */ #include "drmP.h" -#include "drm.h" #include "radeon.h" #include "radeon_drm.h" diff --git a/drivers/gpu/drm/radeon/radeon_sa.c b/drivers/gpu/drm/radeon/radeon_sa.c index 4e771240fdd..d5ae437bbd7 100644 --- a/drivers/gpu/drm/radeon/radeon_sa.c +++ b/drivers/gpu/drm/radeon/radeon_sa.c @@ -42,7 +42,6 @@ * rings. We just wait for any of those fence to complete. */ #include "drmP.h" -#include "drm.h" #include "radeon.h" static void radeon_sa_bo_remove_locked(struct radeon_sa_bo *sa_bo); diff --git a/drivers/gpu/drm/radeon/radeon_semaphore.c b/drivers/gpu/drm/radeon/radeon_semaphore.c index 7cc78de6ddc..67f9a081236 100644 --- a/drivers/gpu/drm/radeon/radeon_semaphore.c +++ b/drivers/gpu/drm/radeon/radeon_semaphore.c @@ -28,7 +28,6 @@ * Christian König <deathsimple@vodafone.de> */ #include "drmP.h" -#include "drm.h" #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c index e8422ae7fe7..2a56d4542d6 100644 --- a/drivers/gpu/drm/radeon/radeon_state.c +++ b/drivers/gpu/drm/radeon/radeon_state.c @@ -28,9 +28,7 @@ */ #include "drmP.h" -#include "drm.h" #include "drm_buffer.h" -#include "drm_sarea.h" #include "radeon_drm.h" #include "radeon_drv.h" |