diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /include/rdma/iw_cm.h | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Diffstat (limited to 'include/rdma/iw_cm.h')
| -rw-r--r-- | include/rdma/iw_cm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h index aeefa9b740dc..cbb822e8d791 100644 --- a/include/rdma/iw_cm.h +++ b/include/rdma/iw_cm.h | |||
| @@ -62,7 +62,7 @@ struct iw_cm_event { | |||
| 62 | struct sockaddr_in remote_addr; | 62 | struct sockaddr_in remote_addr; |
| 63 | void *private_data; | 63 | void *private_data; |
| 64 | u8 private_data_len; | 64 | u8 private_data_len; |
| 65 | void* provider_data; | 65 | void *provider_data; |
| 66 | }; | 66 | }; |
| 67 | 67 | ||
| 68 | /** | 68 | /** |