From 4126d5d61f8466be3f76c1bc4e16d46eb2c9641b Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Tue, 2 Oct 2012 18:01:05 +0100
Subject: UAPI: (Scripted) Remove redundant DRM UAPI header #inclusions from
 drivers/gpu/.
Git-commit: 4126d5d61f8466be3f76c1bc4e16d46eb2c9641b
Patch-mainline: v3.7-rc1

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>
Acked-by: Michal Srb <msrb@suse.com>
---
 drivers/gpu/drm/ast/ast_drv.c               |    1 -
 drivers/gpu/drm/ast/ast_fb.c                |    1 -
 drivers/gpu/drm/cirrus/cirrus_drv.c         |    1 -
 drivers/gpu/drm/cirrus/cirrus_fbdev.c       |    1 -
 drivers/gpu/drm/cirrus/cirrus_main.c        |    1 -
 drivers/gpu/drm/cirrus/cirrus_mode.c        |    1 -
 drivers/gpu/drm/drm_crtc.c                  |    1 -
 drivers/gpu/drm/drm_modes.c                 |    1 -
 drivers/gpu/drm/gma500/intel_gmbus.c        |    1 -
 drivers/gpu/drm/gma500/psb_intel_sdvo.c     |    1 -
 drivers/gpu/drm/i810/i810_dma.c             |    1 -
 drivers/gpu/drm/i810/i810_drv.c             |    1 -
 drivers/gpu/drm/i915/dvo.h                  |    1 -
 drivers/gpu/drm/i915/i915_debugfs.c         |    1 -
 drivers/gpu/drm/i915/i915_dma.c             |    1 -
 drivers/gpu/drm/i915/i915_drv.c             |    1 -
 drivers/gpu/drm/i915/i915_gem.c             |    1 -
 drivers/gpu/drm/i915/i915_gem_debug.c       |    1 -
 drivers/gpu/drm/i915/i915_gem_evict.c       |    1 -
 drivers/gpu/drm/i915/i915_gem_execbuffer.c  |    1 -
 drivers/gpu/drm/i915/i915_gem_gtt.c         |    1 -
 drivers/gpu/drm/i915/i915_gem_stolen.c      |    1 -
 drivers/gpu/drm/i915/i915_gem_tiling.c      |    1 -
 drivers/gpu/drm/i915/i915_ioc32.c           |    1 -
 drivers/gpu/drm/i915/i915_irq.c             |    1 -
 drivers/gpu/drm/i915/i915_suspend.c         |    1 -
 drivers/gpu/drm/i915/intel_bios.c           |    1 -
 drivers/gpu/drm/i915/intel_crt.c            |    1 -
 drivers/gpu/drm/i915/intel_dp.c             |    1 -
 drivers/gpu/drm/i915/intel_dvo.c            |    1 -
 drivers/gpu/drm/i915/intel_fb.c             |    1 -
 drivers/gpu/drm/i915/intel_hdmi.c           |    1 -
 drivers/gpu/drm/i915/intel_i2c.c            |    1 -
 drivers/gpu/drm/i915/intel_lvds.c           |    1 -
 drivers/gpu/drm/i915/intel_overlay.c        |    1 -
 drivers/gpu/drm/i915/intel_ringbuffer.c     |    1 -
 drivers/gpu/drm/i915/intel_sdvo.c           |    1 -
 drivers/gpu/drm/i915/intel_tv.c             |    1 -
 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 -
 drivers/gpu/drm/mgag200/mgag200_drv.c       |    1 -
 drivers/gpu/drm/mgag200/mgag200_fb.c        |    1 -
 drivers/gpu/drm/mgag200/mgag200_i2c.c       |    1 -
 drivers/gpu/drm/mgag200/mgag200_main.c      |    1 -
 drivers/gpu/drm/mgag200/mgag200_mode.c      |    1 -
 drivers/gpu/drm/r128/r128_cce.c             |    1 -
 drivers/gpu/drm/r128/r128_drv.c             |    1 -
 drivers/gpu/drm/r128/r128_ioc32.c           |    1 -
 drivers/gpu/drm/r128/r128_irq.c             |    1 -
 drivers/gpu/drm/r128/r128_state.c           |    1 -
 drivers/gpu/drm/radeon/evergreen_blit_kms.c |    1 -
 drivers/gpu/drm/radeon/r100.c               |    1 -
 drivers/gpu/drm/radeon/r200.c               |    1 -
 drivers/gpu/drm/radeon/r300_cmdbuf.c        |    1 -
 drivers/gpu/drm/radeon/r600_blit.c          |    1 -
 drivers/gpu/drm/radeon/r600_blit_kms.c      |    1 -
 drivers/gpu/drm/radeon/r600_cp.c            |    1 -
 drivers/gpu/drm/radeon/radeon_acpi.c        |    2 --
 drivers/gpu/drm/radeon/radeon_agp.c         |    1 -
 drivers/gpu/drm/radeon/radeon_cp.c          |    2 --
 drivers/gpu/drm/radeon/radeon_drv.c         |    1 -
 drivers/gpu/drm/radeon/radeon_fb.c          |    1 -
 drivers/gpu/drm/radeon/radeon_fence.c       |    1 -
 drivers/gpu/drm/radeon/radeon_gem.c         |    1 -
 drivers/gpu/drm/radeon/radeon_ioc32.c       |    1 -
 drivers/gpu/drm/radeon/radeon_irq.c         |    1 -
 drivers/gpu/drm/radeon/radeon_kms.c         |    1 -
 drivers/gpu/drm/radeon/radeon_mem.c         |    1 -
 drivers/gpu/drm/radeon/radeon_mode.h        |    1 -
 drivers/gpu/drm/radeon/radeon_prime.c       |    1 -
 drivers/gpu/drm/radeon/radeon_sa.c          |    1 -
 drivers/gpu/drm/radeon/radeon_semaphore.c   |    1 -
 drivers/gpu/drm/radeon/radeon_state.c       |    2 --
 drivers/gpu/drm/udl/udl_fb.c                |    1 -
 drivers/gpu/drm/via/via_dma.c               |    1 -
 drivers/gpu/drm/via/via_irq.c               |    1 -
 drivers/gpu/drm/via/via_verifier.c          |    1 -
 129 files changed, 0 insertions(+), 136 deletions(-)

Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/ast/ast_drv.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/ast/ast_drv.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/ast/ast_drv.c
@@ -29,7 +29,6 @@
 #include <linux/console.h>
 
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc_helper.h"
 
 #include "ast_drv.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/ast/ast_fb.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/ast/ast_fb.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/ast/ast_fb.c
@@ -38,7 +38,6 @@
 
 
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc.h"
 #include "drm_fb_helper.h"
 #include "ast_drv.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/cirrus/cirrus_drv.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/cirrus/cirrus_drv.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/cirrus/cirrus_drv.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/console.h>
 #include "drmP.h"
-#include "drm.h"
 
 #include "cirrus_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/cirrus/cirrus_fbdev.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/cirrus/cirrus_fbdev.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/cirrus/cirrus_fbdev.c
@@ -10,7 +10,6 @@
  */
 #include <linux/module.h>
 #include "drmP.h"
-#include "drm.h"
 #include "drm_fb_helper.h"
 
 #include <linux/fb.h>
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/cirrus/cirrus_main.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/cirrus/cirrus_main.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/cirrus/cirrus_main.c
@@ -9,7 +9,6 @@
  *          Dave Airlie
  */
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc_helper.h"
 
 #include "cirrus_drv.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/cirrus/cirrus_mode.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/cirrus/cirrus_mode.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/cirrus/cirrus_mode.c
@@ -15,7 +15,6 @@
  * Copyright 1999-2001 Jeff Garzik <jgarzik@pobox.com>
  */
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc_helper.h"
 
 #include <video/cirrus.h>
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/drm_crtc.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/drm_crtc.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/drm_crtc.c
@@ -31,7 +31,6 @@
  */
 #include <linux/list.h>
 #include <linux/slab.h>
-#include "drm.h"
 #include "drmP.h"
 #include "drm_crtc.h"
 #include "drm_edid.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/drm_modes.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/drm_modes.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/drm_modes.c
@@ -33,7 +33,6 @@
 #include <linux/list.h>
 #include <linux/list_sort.h>
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc.h"
 
 /**
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i810/i810_dma.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i810/i810_dma.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i810/i810_dma.c
@@ -31,7 +31,6 @@
  */
 
 #include "drmP.h"
-#include "drm.h"
 #include "i810_drm.h"
 #include "i810_drv.h"
 #include <linux/interrupt.h>	/* For task queue support */
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i810/i810_drv.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i810/i810_drv.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i810/i810_drv.c
@@ -33,7 +33,6 @@
 #include <linux/module.h>
 
 #include "drmP.h"
-#include "drm.h"
 #include "i810_drm.h"
 #include "i810_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/dvo.h
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/dvo.h
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/dvo.h
@@ -25,7 +25,6 @@
 
 #include <linux/i2c.h>
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc.h"
 #include "intel_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_debugfs.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/i915_debugfs.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_debugfs.c
@@ -30,7 +30,6 @@
 #include <linux/debugfs.h>
 #include <linux/slab.h>
 #include "drmP.h"
-#include "drm.h"
 #include "intel_drv.h"
 #include "intel_ringbuffer.h"
 #include "i915_drm.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_dma.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/i915_dma.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_dma.c
@@ -29,7 +29,6 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc_helper.h"
 #include "drm_fb_helper.h"
 #include "intel_drv.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_drv.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/i915_drv.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_drv.c
@@ -29,7 +29,6 @@
 
 #include <linux/device.h>
 #include "drmP.h"
-#include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
 #include "i915_trace.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_gem.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/i915_gem.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_gem.c
@@ -26,7 +26,6 @@
  */
 
 #include "drmP.h"
-#include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
 #include "i915_trace.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_gem_debug.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/i915_gem_debug.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_gem_debug.c
@@ -26,7 +26,6 @@
  */
 
 #include "drmP.h"
-#include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_gem_evict.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/i915_gem_evict.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_gem_evict.c
@@ -27,7 +27,6 @@
  */
 
 #include "drmP.h"
-#include "drm.h"
 #include "i915_drv.h"
 #include "i915_drm.h"
 #include "i915_trace.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_gem_execbuffer.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -27,7 +27,6 @@
  */
 
 #include "drmP.h"
-#include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
 #include "i915_trace.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_gem_gtt.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -23,7 +23,6 @@
  */
 
 #include "drmP.h"
-#include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
 #include "i915_trace.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_gem_stolen.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -27,7 +27,6 @@
  */
 
 #include "drmP.h"
-#include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_gem_tiling.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -28,7 +28,6 @@
 #include "linux/string.h"
 #include "linux/bitops.h"
 #include "drmP.h"
-#include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_ioc32.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/i915_ioc32.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_ioc32.c
@@ -32,7 +32,6 @@
 #include <linux/compat.h>
 
 #include "drmP.h"
-#include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_irq.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/i915_irq.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_irq.c
@@ -31,7 +31,6 @@
 #include <linux/sysrq.h>
 #include <linux/slab.h>
 #include "drmP.h"
-#include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
 #include "i915_trace.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_suspend.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/i915_suspend.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/i915_suspend.c
@@ -25,7 +25,6 @@
  */
 
 #include "drmP.h"
-#include "drm.h"
 #include "i915_drm.h"
 #include "intel_drv.h"
 #include "i915_reg.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_bios.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/intel_bios.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_bios.c
@@ -27,7 +27,6 @@
 #include <linux/dmi.h>
 #include <drm/drm_dp_helper.h>
 #include "drmP.h"
-#include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
 #include "intel_bios.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_crt.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/intel_crt.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_crt.c
@@ -28,7 +28,6 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc.h"
 #include "drm_crtc_helper.h"
 #include "drm_edid.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_dp.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/intel_dp.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_dp.c
@@ -28,7 +28,6 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc.h"
 #include "drm_crtc_helper.h"
 #include "drm_edid.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_dvo.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/intel_dvo.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_dvo.c
@@ -27,7 +27,6 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc.h"
 #include "intel_drv.h"
 #include "i915_drm.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_fb.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/intel_fb.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_fb.c
@@ -37,7 +37,6 @@
 #include <linux/vga_switcheroo.h>
 
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc.h"
 #include "drm_fb_helper.h"
 #include "intel_drv.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_hdmi.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/intel_hdmi.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_hdmi.c
@@ -30,7 +30,6 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc.h"
 #include "drm_edid.h"
 #include "intel_drv.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_i2c.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/intel_i2c.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_i2c.c
@@ -29,7 +29,6 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 #include "drmP.h"
-#include "drm.h"
 #include "intel_drv.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_lvds.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/intel_lvds.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_lvds.c
@@ -32,7 +32,6 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc.h"
 #include "drm_edid.h"
 #include "intel_drv.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_overlay.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/intel_overlay.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_overlay.c
@@ -26,7 +26,6 @@
  * Derived from Xorg ddx, xf86-video-intel, src/i830_video.c
  */
 #include "drmP.h"
-#include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
 #include "i915_reg.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_ringbuffer.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -28,7 +28,6 @@
  */
 
 #include "drmP.h"
-#include "drm.h"
 #include "i915_drv.h"
 #include "i915_drm.h"
 #include "i915_trace.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_sdvo.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/intel_sdvo.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_sdvo.c
@@ -29,7 +29,6 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc.h"
 #include "drm_edid.h"
 #include "intel_drv.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_tv.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/i915/intel_tv.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/i915/intel_tv.c
@@ -31,7 +31,6 @@
  */
 
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc.h"
 #include "drm_edid.h"
 #include "intel_drv.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/mga/mga_dma.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/mga/mga_dma.c
+++ linux-3.0-SLE11-SP3/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"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/mga/mga_drv.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/mga/mga_drv.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/mga/mga_drv.c
@@ -32,7 +32,6 @@
 #include <linux/module.h>
 
 #include "drmP.h"
-#include "drm.h"
 #include "mga_drm.h"
 #include "mga_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/mga/mga_ioc32.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/mga/mga_ioc32.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/mga/mga_ioc32.c
@@ -33,7 +33,6 @@
 #include <linux/compat.h>
 
 #include "drmP.h"
-#include "drm.h"
 #include "mga_drm.h"
 
 typedef struct drm32_mga_init {
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/mga/mga_irq.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/mga/mga_irq.c
+++ linux-3.0-SLE11-SP3/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"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/mga/mga_state.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/mga/mga_state.c
+++ linux-3.0-SLE11-SP3/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"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/mga/mga_warp.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/mga/mga_warp.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/mga/mga_warp.c
@@ -33,7 +33,6 @@
 #include <linux/module.h>
 
 #include "drmP.h"
-#include "drm.h"
 #include "mga_drm.h"
 #include "mga_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/mgag200/mgag200_drv.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/mgag200/mgag200_drv.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/console.h>
 #include "drmP.h"
-#include "drm.h"
 
 #include "mgag200_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/mgag200/mgag200_fb.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/mgag200/mgag200_fb.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/mgag200/mgag200_fb.c
@@ -12,7 +12,6 @@
  */
 #include <linux/module.h>
 #include "drmP.h"
-#include "drm.h"
 #include "drm_fb_helper.h"
 
 #include <linux/fb.h>
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/mgag200/mgag200_i2c.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/mgag200/mgag200_i2c.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/mgag200/mgag200_i2c.c
@@ -29,7 +29,6 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 #include "drmP.h"
-#include "drm.h"
 
 #include "mgag200_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/mgag200/mgag200_main.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/mgag200/mgag200_main.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/mgag200/mgag200_main.c
@@ -11,7 +11,6 @@
  *          Dave Airlie
  */
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc_helper.h"
 #include "mgag200_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/mgag200/mgag200_mode.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -14,7 +14,6 @@
 #include <linux/delay.h>
 
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc_helper.h"
 
 #include "mgag200_drv.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/r128/r128_cce.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/r128/r128_cce.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/r128/r128_cce.c
@@ -35,7 +35,6 @@
 #include <linux/module.h>
 
 #include "drmP.h"
-#include "drm.h"
 #include "r128_drm.h"
 #include "r128_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/r128/r128_drv.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/r128/r128_drv.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/r128/r128_drv.c
@@ -32,7 +32,6 @@
 #include <linux/module.h>
 
 #include "drmP.h"
-#include "drm.h"
 #include "r128_drm.h"
 #include "r128_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/r128/r128_ioc32.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/r128/r128_ioc32.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/r128/r128_ioc32.c
@@ -32,7 +32,6 @@
 #include <linux/compat.h>
 
 #include "drmP.h"
-#include "drm.h"
 #include "r128_drm.h"
 
 typedef struct drm_r128_init32 {
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/r128/r128_irq.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/r128/r128_irq.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/r128/r128_irq.c
@@ -31,7 +31,6 @@
  */
 
 #include "drmP.h"
-#include "drm.h"
 #include "r128_drm.h"
 #include "r128_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/r128/r128_state.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/r128/r128_state.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/r128/r128_state.c
@@ -29,7 +29,6 @@
  */
 
 #include "drmP.h"
-#include "drm.h"
 #include "r128_drm.h"
 #include "r128_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/evergreen_blit_kms.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/evergreen_blit_kms.c
+++ linux-3.0-SLE11-SP3/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"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/r100.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/r100.c
+++ linux-3.0-SLE11-SP3/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"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/r200.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/r200.c
+++ linux-3.0-SLE11-SP3/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"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/r300_cmdbuf.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/r300_cmdbuf.c
+++ linux-3.0-SLE11-SP3/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"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/r600_blit.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/r600_blit.c
+++ linux-3.0-SLE11-SP3/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"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/r600_blit_kms.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/r600_blit_kms.c
+++ linux-3.0-SLE11-SP3/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"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/r600_cp.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/r600_cp.c
+++ linux-3.0-SLE11-SP3/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"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_acpi.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_acpi.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_acpi.c
@@ -30,8 +30,6 @@
 #include <acpi/video.h>
 
 #include "drmP.h"
-#include "drm.h"
-#include "drm_sarea.h"
 #include "drm_crtc_helper.h"
 #include "radeon.h"
 #include "radeon_acpi.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_agp.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_agp.c
+++ linux-3.0-SLE11-SP3/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"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_cp.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_cp.c
+++ linux-3.0-SLE11-SP3/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"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_drv.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_drv.c
+++ linux-3.0-SLE11-SP3/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"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_fb.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_fb.c
+++ linux-3.0-SLE11-SP3/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"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_fence.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_fence.c
+++ linux-3.0-SLE11-SP3/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"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_gem.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_gem.c
+++ linux-3.0-SLE11-SP3/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"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_ioc32.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_ioc32.c
+++ linux-3.0-SLE11-SP3/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"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_irq.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_irq.c
+++ linux-3.0-SLE11-SP3/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"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_kms.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_kms.c
+++ linux-3.0-SLE11-SP3/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"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_mem.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_mem.c
+++ linux-3.0-SLE11-SP3/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"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_mode.h
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_mode.h
+++ linux-3.0-SLE11-SP3/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>
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_prime.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_prime.c
+++ linux-3.0-SLE11-SP3/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"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_sa.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_sa.c
+++ linux-3.0-SLE11-SP3/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);
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_semaphore.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_semaphore.c
+++ linux-3.0-SLE11-SP3/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"
 
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/radeon/radeon_state.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/radeon/radeon_state.c
+++ linux-3.0-SLE11-SP3/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"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/udl/udl_fb.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/udl/udl_fb.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/udl/udl_fb.c
@@ -16,7 +16,6 @@
 #include <linux/dma-buf.h>
 
 #include "drmP.h"
-#include "drm.h"
 #include "drm_crtc.h"
 #include "drm_crtc_helper.h"
 #include "udl_drv.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/via/via_dma.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/via/via_dma.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/via/via_dma.c
@@ -35,7 +35,6 @@
  */
 
 #include "drmP.h"
-#include "drm.h"
 #include "via_drm.h"
 #include "via_drv.h"
 #include "via_3d_reg.h"
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/via/via_irq.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/via/via_irq.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/via/via_irq.c
@@ -36,7 +36,6 @@
  */
 
 #include "drmP.h"
-#include "drm.h"
 #include "via_drm.h"
 #include "via_drv.h"
 
Index: linux-3.0-SLE11-SP3/drivers/gpu/drm/via/via_verifier.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/drivers/gpu/drm/via/via_verifier.c
+++ linux-3.0-SLE11-SP3/drivers/gpu/drm/via/via_verifier.c
@@ -30,7 +30,6 @@
 
 #include "via_3d_reg.h"
 #include "drmP.h"
-#include "drm.h"
 #include "via_drm.h"
 #include "via_verifier.h"
 #include "via_drv.h"
