diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-06-29 20:09:44 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-06-29 20:09:44 +0100 |
| commit | 8a78dead291ffdb5a8774419cdca369a1e27cad9 (patch) | |
| tree | 399b8378e32036bdc7dadc10c639465a8fb21681 /linux-core/i915_ioc32.c | |
| parent | e79e2a58161d44754fd55507e155b7e12a09c4d2 (diff) | |
| parent | a27af4c4a665864df09123f177ca7269e48f6171 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
linux-core/drm_drv.c
linux-core/drm_fops.c
linux-core/drm_objects.h
linux-core/drm_stub.c
shared-core/i915_dma.c
Diffstat (limited to 'linux-core/i915_ioc32.c')
| -rw-r--r-- | linux-core/i915_ioc32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linux-core/i915_ioc32.c b/linux-core/i915_ioc32.c index 396f5c21..c1e776b7 100644 --- a/linux-core/i915_ioc32.c +++ b/linux-core/i915_ioc32.c @@ -30,7 +30,6 @@ * IN THE SOFTWARE. */ #include <linux/compat.h> -#include <linux/ioctl32.h> #include "drmP.h" #include "drm.h" |