Merge branch 'from-linus' into upstream

[linux-2.6-omap-h63xx.git] / drivers / char / drm / i915_ioc32.c

diff --git a/drivers/char/drm/i915_ioc32.c b/drivers/char/drm/i915_ioc32.c
index 2218a946ec872e4041232b01d23a77624349e5b7..296248cdc767e50cc2cdd1c0f40a6deedf4b299e 100644 (file)
--- a/drivers/char/drm/i915_ioc32.c
+++ b/drivers/char/drm/i915_ioc32.c
@@ -30,7 +30,6 @@
  * IN THE SOFTWARE.
  */
 #include <linux/compat.h>
-#include <linux/ioctl32.h>
 
 #include "drmP.h"
 #include "drm.h"