diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-23 09:56:33 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-23 09:56:33 -0400 |
| commit | 85ae01b2da0ed606a2e8d840aadef90fd30220a1 (patch) | |
| tree | f9eaa974b88b9db09dab9e5f6876e87d12543fe4 /ipc/syscall.c | |
| parent | 6407d474e6ae6a798fa5ba40b32f508a52de80ff (diff) | |
| parent | 306ff3e473a970f88680e8355c0900fcab0357e2 (diff) | |
Merge remote branch 'alsa/devel' into topic/usb
Diffstat (limited to 'ipc/syscall.c')
| -rw-r--r-- | ipc/syscall.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/syscall.c b/ipc/syscall.c index 355a3da9ec7..1d6f53f6b56 100644 --- a/ipc/syscall.c +++ b/ipc/syscall.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/syscalls.h> | 13 | #include <linux/syscalls.h> |
| 14 | #include <linux/uaccess.h> | 14 | #include <linux/uaccess.h> |
| 15 | 15 | ||
| 16 | SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, int, second, | 16 | SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second, |
| 17 | unsigned long, third, void __user *, ptr, long, fifth) | 17 | unsigned long, third, void __user *, ptr, long, fifth) |
| 18 | { | 18 | { |
| 19 | int version, ret; | 19 | int version, ret; |