diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:51:36 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:51:36 +0000 |
| commit | e624ae8e0d4243e71daedce7570e91290438eaca (patch) | |
| tree | e2b9804379a6aab3d2471898d257fe5590feb70c /arch/tile/kernel/compat_signal.c | |
| parent | drm/i915: Capture interesting display registers on error (diff) | |
| parent | Merge remote branch 'linus' into drm-intel-fixes (diff) | |
| download | linux-dev-e624ae8e0d4243e71daedce7570e91290438eaca.tar.xz linux-dev-e624ae8e0d4243e71daedce7570e91290438eaca.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
Diffstat (limited to 'arch/tile/kernel/compat_signal.c')
| -rw-r--r-- | arch/tile/kernel/compat_signal.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/tile/kernel/compat_signal.c b/arch/tile/kernel/compat_signal.c index fb64b99959d4..543d6a33aa26 100644 --- a/arch/tile/kernel/compat_signal.c +++ b/arch/tile/kernel/compat_signal.c @@ -15,7 +15,6 @@ #include <linux/sched.h> #include <linux/mm.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/kernel.h> #include <linux/signal.h> #include <linux/errno.h> |