diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-08 15:45:45 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-08 15:45:45 +0100 |
| commit | 364f6c717deef4a3ac4982e670fa9846b43cd060 (patch) | |
| tree | 47e3967d6e2220130f2c070e300c97709143b28f /arch/ia64/ia32/sys_ia32.c | |
| parent | 4ff4258a3e558814a3d48c50a59cd22f56bbea2f (diff) | |
| parent | 1d6757fbff5bc86e94e59ab0d7bdd7e71351d839 (diff) | |
| download | op-kernel-dev-364f6c717deef4a3ac4982e670fa9846b43cd060.zip op-kernel-dev-364f6c717deef4a3ac4982e670fa9846b43cd060.tar.gz | |
Automatic merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'arch/ia64/ia32/sys_ia32.c')
| -rw-r--r-- | arch/ia64/ia32/sys_ia32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c index 247a21c..c1e20d6 100644 --- a/arch/ia64/ia32/sys_ia32.c +++ b/arch/ia64/ia32/sys_ia32.c @@ -2427,7 +2427,7 @@ sys32_epoll_wait(int epfd, struct epoll_event32 __user * events, int maxevents, { struct epoll_event *events64 = NULL; mm_segment_t old_fs = get_fs(); - int error, numevents, size; + int numevents, size; int evt_idx; int do_free_pages = 0; |
