diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-19 04:38:57 +0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-19 04:38:57 +0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /include/linux/kernelcapi.h | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
| download | linux-1ff8392c32a2645d2665ca779ecb91bb29361c13.tar.xz | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'include/linux/kernelcapi.h')
| -rw-r--r-- | include/linux/kernelcapi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernelcapi.h b/include/linux/kernelcapi.h index aea34e74c496..8c4350a9ed87 100644 --- a/include/linux/kernelcapi.h +++ b/include/linux/kernelcapi.h @@ -64,7 +64,7 @@ struct capi20_appl { unsigned long nrecvdatapkt; unsigned long nsentctlpkt; unsigned long nsentdatapkt; - struct semaphore recv_sem; + struct mutex recv_mtx; struct sk_buff_head recv_queue; struct work_struct recv_work; int release_in_progress; |