diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-29 18:44:22 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-29 18:44:22 (GMT) |
| commit | 8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf (patch) | |
| tree | d4933996296141103b1f54e563268b23c95d6dd4 /arch/tile/mm/fault.c | |
| parent | 412dc7f368bf10a8049a8a4c41abbfd0108742e7 (diff) | |
| parent | 72083646528d4887b920deb71b37e09bc7d227bb (diff) | |
| download | linux-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.tar.xz | |
Merge branch 'master' into work
Diffstat (limited to 'arch/tile/mm/fault.c')
| -rw-r--r-- | arch/tile/mm/fault.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c index f295b4a..dcebfc8 100644 --- a/arch/tile/mm/fault.c +++ b/arch/tile/mm/fault.c @@ -24,7 +24,6 @@ #include <linux/mman.h> #include <linux/mm.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/interrupt.h> #include <linux/init.h> #include <linux/tty.h> |