diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 03:51:36 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 03:51:36 -0500 |
| commit | e624ae8e0d4243e71daedce7570e91290438eaca (patch) | |
| tree | e2b9804379a6aab3d2471898d257fe5590feb70c /drivers/char/agp | |
| parent | c4a1d9e4dc5d5313cfec2cc0c9d630efe8a6f287 (diff) | |
| parent | 4ab0fbd3a29067e1540f05093ae4ed07645d18c8 (diff) | |
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.c | 1 |
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 @@ | |||
| 39 | #include <linux/mm.h> | 39 | #include <linux/mm.h> |
| 40 | #include <linux/fs.h> | 40 | #include <linux/fs.h> |
| 41 | #include <linux/sched.h> | 41 | #include <linux/sched.h> |
| 42 | #include <linux/smp_lock.h> | ||
| 43 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
| 44 | #include <asm/pgtable.h> | 43 | #include <asm/pgtable.h> |
| 45 | #include "agp.h" | 44 | #include "agp.h" |