Commit 4126d5d6 authored by David Howells's avatar David Howells
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarDave Airlie <airlied@redhat.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: default avatarDave Jones <davej@redhat.com>
parent 19218e48
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
*/ */
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_drm.h" #include "i915_drm.h"
#include "i915_trace.h" #include "i915_trace.h"
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/export.h> #include <linux/export.h>
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "drm_crtc.h" #include "drm_crtc.h"
#include "drm_edid.h" #include "drm_edid.h"
#include "intel_drv.h" #include "intel_drv.h"
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
*/ */
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "drm_crtc.h" #include "drm_crtc.h"
#include "drm_edid.h" #include "drm_edid.h"
#include "intel_drv.h" #include "intel_drv.h"
......
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
*/ */
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "drm_sarea.h"
#include "mga_drm.h" #include "mga_drm.h"
#include "mga_drv.h" #include "mga_drv.h"
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <linux/module.h> #include <linux/module.h>
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "mga_drm.h" #include "mga_drm.h"
#include "mga_drv.h" #include "mga_drv.h"
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <linux/compat.h> #include <linux/compat.h>
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "mga_drm.h" #include "mga_drm.h"
typedef struct drm32_mga_init { typedef struct drm32_mga_init {
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
*/ */
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "mga_drm.h" #include "mga_drm.h"
#include "mga_drv.h" #include "mga_drv.h"
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
*/ */
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "mga_drm.h" #include "mga_drm.h"
#include "mga_drv.h" #include "mga_drv.h"
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <linux/module.h> #include <linux/module.h>
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "mga_drm.h" #include "mga_drm.h"
#include "mga_drv.h" #include "mga_drv.h"
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/console.h> #include <linux/console.h>
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "mgag200_drv.h" #include "mgag200_drv.h"
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "drm_fb_helper.h" #include "drm_fb_helper.h"
#include <linux/fb.h> #include <linux/fb.h>
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-algo-bit.h> #include <linux/i2c-algo-bit.h>
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "mgag200_drv.h" #include "mgag200_drv.h"
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
* Dave Airlie * Dave Airlie
*/ */
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "drm_crtc_helper.h" #include "drm_crtc_helper.h"
#include "mgag200_drv.h" #include "mgag200_drv.h"
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <linux/delay.h> #include <linux/delay.h>
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "drm_crtc_helper.h" #include "drm_crtc_helper.h"
#include "mgag200_drv.h" #include "mgag200_drv.h"
......
...@@ -8,8 +8,6 @@ ...@@ -8,8 +8,6 @@
#include <linux/mxm-wmi.h> #include <linux/mxm-wmi.h>
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "drm_sarea.h"
#include "drm_crtc_helper.h" #include "drm_crtc_helper.h"
#include "nouveau_drv.h" #include "nouveau_drv.h"
#include "nouveau_drm.h" #include "nouveau_drm.h"
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
*/ */
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "nouveau_drv.h" #include "nouveau_drv.h"
#include "nouveau_drm.h" #include "nouveau_drm.h"
#include "nouveau_dma.h" #include "nouveau_dma.h"
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
*/ */
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "nouveau_drv.h" #include "nouveau_drv.h"
#include "nouveau_dma.h" #include "nouveau_dma.h"
#include "nouveau_ramht.h" #include "nouveau_ramht.h"
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <linux/module.h> #include <linux/module.h>
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "drm_crtc_helper.h" #include "drm_crtc_helper.h"
#include "nouveau_drv.h" #include "nouveau_drv.h"
#include "nouveau_abi16.h" #include "nouveau_abi16.h"
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include <linux/console.h> #include <linux/console.h>
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include "drm_crtc.h" #include "drm_crtc.h"
#include "drm_crtc_helper.h" #include "drm_crtc_helper.h"
#include "drm_fb_helper.h" #include "drm_fb_helper.h"
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
*/ */
#include "drmP.h" #include "drmP.h"
#include "drm.h"
#include <linux/ktime.h> #include <linux/ktime.h>
#include <linux/hrtimer.h> #include <linux/hrtimer.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment