diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-11-24 19:30:28 +0100 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-11-24 19:30:28 +0100 |
| commit | b03a6c4c7d8ebd8118d668eafdb85f5f76b5437f (patch) | |
| tree | f6ca7059e9c1bc1aac9a6741316f8e07ba349f7f /arch/x86/ia32/sys_ia32.c | |
| parent | arch/tile: fix rwlock so would-be write lockers don't block new readers (diff) | |
| parent | Linux 2.6.37-rc3 (diff) | |
| download | linux-b03a6c4c7d8ebd8118d668eafdb85f5f76b5437f.tar.xz linux-b03a6c4c7d8ebd8118d668eafdb85f5f76b5437f.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/x86/ia32/sys_ia32.c')
| -rw-r--r-- | arch/x86/ia32/sys_ia32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c index 849813f398e7..5852519b2d0f 100644 --- a/arch/x86/ia32/sys_ia32.c +++ b/arch/x86/ia32/sys_ia32.c @@ -28,7 +28,6 @@ #include <linux/syscalls.h> #include <linux/times.h> #include <linux/utsname.h> -#include <linux/smp_lock.h> #include <linux/mm.h> #include <linux/uio.h> #include <linux/poll.h> |