Merge branches 'release' and 'fluff' into release

[linux-2.6] / include / rdma / ib_verbs.h

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 11f39606e7d94c64c1a63c6e5772dbca944a538c..cfbd38fe299825f7101925860abc70c08d7f8dbb 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1026,7 +1026,7 @@ struct ib_device {
 
        struct module               *owner;
        struct class_device          class_dev;
-       struct kobject               ports_parent;
+       struct kobject               *ports_parent;
        struct list_head             port_list;
 
        enum {