summaryrefslogtreecommitdiffstats
path: root/drivers/char/agp
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-11-22 09:51:36 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-11-22 09:51:36 +0100
commite624ae8e0d4243e71daedce7570e91290438eaca (patch)
treee2b9804379a6aab3d2471898d257fe5590feb70c /drivers/char/agp
parentdrm/i915: Capture interesting display registers on error (diff)
parentMerge remote branch 'linus' into drm-intel-fixes (diff)
downloadlinux-e624ae8e0d4243e71daedce7570e91290438eaca.tar.xz
linux-e624ae8e0d4243e71daedce7570e91290438eaca.zip
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts: drivers/gpu/drm/i915/i915_gem.c
Diffstat (limited to 'drivers/char/agp')
-rw-r--r--drivers/char/agp/frontend.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 43412c03969e..3cb4539a98b2 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -39,7 +39,6 @@
#include <linux/mm.h>
#include <linux/fs.h>
#include <linux/sched.h>
-#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
#include "agp.h"