From 4126d5d61f8466be3f76c1bc4e16d46eb2c9641b Mon Sep 17 00:00:00 2001 From: David Howells Date: Tue, 2 Oct 2012 18:01:05 +0100 Subject: 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 Acked-by: Dave Airlie Acked-by: Arnd Bergmann Acked-by: Thomas Gleixner Acked-by: Paul E. McKenney Acked-by: Dave Jones --- drivers/gpu/drm/mga/mga_dma.c | 2 -- drivers/gpu/drm/mga/mga_drv.c | 1 - drivers/gpu/drm/mga/mga_ioc32.c | 1 - drivers/gpu/drm/mga/mga_irq.c | 1 - drivers/gpu/drm/mga/mga_state.c | 1 - drivers/gpu/drm/mga/mga_warp.c | 1 - 6 files changed, 7 deletions(-) (limited to 'drivers/gpu/drm/mga') diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c index 507aa3df0168..1e5a4965724d 100644 --- a/drivers/gpu/drm/mga/mga_dma.c +++ b/drivers/gpu/drm/mga/mga_dma.c @@ -36,8 +36,6 @@ */ #include "drmP.h" -#include "drm.h" -#include "drm_sarea.h" #include "mga_drm.h" #include "mga_drv.h" diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c index b1bb46de3f5a..7a98a520ed92 100644 --- a/drivers/gpu/drm/mga/mga_drv.c +++ b/drivers/gpu/drm/mga/mga_drv.c @@ -32,7 +32,6 @@ #include #include "drmP.h" -#include "drm.h" #include "mga_drm.h" #include "mga_drv.h" diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c index c1f877b7bac1..67cc2a96e386 100644 --- a/drivers/gpu/drm/mga/mga_ioc32.c +++ b/drivers/gpu/drm/mga/mga_ioc32.c @@ -33,7 +33,6 @@ #include #include "drmP.h" -#include "drm.h" #include "mga_drm.h" typedef struct drm32_mga_init { diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c index 2581202297e4..89f88df7893c 100644 --- a/drivers/gpu/drm/mga/mga_irq.c +++ b/drivers/gpu/drm/mga/mga_irq.c @@ -32,7 +32,6 @@ */ #include "drmP.h" -#include "drm.h" #include "mga_drm.h" #include "mga_drv.h" diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c index 9ce2827f8c00..1f9fb5a00a62 100644 --- a/drivers/gpu/drm/mga/mga_state.c +++ b/drivers/gpu/drm/mga/mga_state.c @@ -33,7 +33,6 @@ */ #include "drmP.h" -#include "drm.h" #include "mga_drm.h" #include "mga_drv.h" diff --git a/drivers/gpu/drm/mga/mga_warp.c b/drivers/gpu/drm/mga/mga_warp.c index 722a91b69b0c..e38b17366635 100644 --- a/drivers/gpu/drm/mga/mga_warp.c +++ b/drivers/gpu/drm/mga/mga_warp.c @@ -33,7 +33,6 @@ #include #include "drmP.h" -#include "drm.h" #include "mga_drm.h" #include "mga_drv.h" -- cgit v1.2.3-59-g8ed1b