diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-16 03:07:59 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-16 03:07:59 +0200 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /include/rdma/iw_cm.h | |
| parent | Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build (diff) | |
| parent | Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff) | |
| download | linux-84c3d4aaec3338201b449034beac41635866bddf.tar.xz linux-84c3d4aaec3338201b449034beac41635866bddf.zip | |
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 { struct sockaddr_in remote_addr; void *private_data; u8 private_data_len; - void* provider_data; + void *provider_data; }; /** |