diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-22 02:10:01 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-22 02:10:01 -0500 |
| commit | 752a4a95e3c96a8e8d3405b16d292f13e8c7856b (patch) | |
| tree | 838e43696fdc45b83f082eef7230d79cfe699497 /arch/tile/kernel/sys.c | |
| parent | bc3f67a3e1b20756d4bfa5886a6b8fd0c068e6a4 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into spi/next
Diffstat (limited to 'arch/tile/kernel/sys.c')
| -rw-r--r-- | arch/tile/kernel/sys.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/tile/kernel/sys.c b/arch/tile/kernel/sys.c index 7e764669a022..e2187d24a9b4 100644 --- a/arch/tile/kernel/sys.c +++ b/arch/tile/kernel/sys.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 22 | #include <linux/smp.h> | 22 | #include <linux/smp.h> |
| 23 | #include <linux/smp_lock.h> | ||
| 24 | #include <linux/syscalls.h> | 23 | #include <linux/syscalls.h> |
| 25 | #include <linux/mman.h> | 24 | #include <linux/mman.h> |
| 26 | #include <linux/file.h> | 25 | #include <linux/file.h> |