aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-05-27 11:56:41 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-05-27 11:56:41 -0700
commitb76e6c725d680d395266dae0d757d678deba4b05 (patch)
tree865eb05ec6e144c07e6c26feeeb5cfab2d7578dc
parentafc1d93aa4935530985d7ec0a0439c9562836521 (diff)
downloadpatches-b76e6c725d680d395266dae0d757d678deba4b05.tar.gz
fix ib patch
-rw-r--r--driver-core/infiniband-make-cm_device-use-a-struct-device-and-not-a-kobject.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/driver-core/infiniband-make-cm_device-use-a-struct-device-and-not-a-kobject.patch b/driver-core/infiniband-make-cm_device-use-a-struct-device-and-not-a-kobject.patch
index 604d0289454938..a07836844cff98 100644
--- a/driver-core/infiniband-make-cm_device-use-a-struct-device-and-not-a-kobject.patch
+++ b/driver-core/infiniband-make-cm_device-use-a-struct-device-and-not-a-kobject.patch
@@ -18,8 +18,8 @@ Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
- drivers/infiniband/core/cm.c | 31 ++++++++++---------------------
- 1 file changed, 10 insertions(+), 21 deletions(-)
+ drivers/infiniband/core/cm.c | 29 +++++++++--------------------
+ 1 file changed, 9 insertions(+), 20 deletions(-)
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
u8 ack_delay;
struct cm_port *port[0];
};
-@@ -3620,19 +3621,7 @@ static struct kobj_type cm_port_obj_type
+@@ -3620,18 +3621,6 @@ static struct kobj_type cm_port_obj_type
.release = cm_release_port_obj
};
@@ -56,11 +56,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
- .release = cm_release_dev_obj
-};
-
--struct class cm_class = {
-+static struct class cm_class = {
+ struct class cm_class = {
.name = "infiniband_cm",
};
- EXPORT_SYMBOL(cm_class);
@@ -3642,7 +3631,7 @@ static int cm_create_port_fs(struct cm_p
int i, ret;