From: Roland Dreier <rolandd@cisco.com>
Date: Mon, 24 Oct 2005 17:55:29 +0000 (-0700)
Subject: Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
X-Git-Tag: v2.6.15-rc1~731^2~21^2~12
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ec329a135974f1c400214dab02f09584d4beeba9;p=linux-2.6-omap-h63xx.git

Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
---

ec329a135974f1c400214dab02f09584d4beeba9
diff --cc drivers/infiniband/core/ucm.c
index 02ca642089b,5a6ba4030d4..28477565ecb
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@@ -1447,9 -1316,11 +1447,10 @@@ err
  
  static void __exit ib_ucm_cleanup(void)
  {
 -	class_device_destroy(ib_ucm_class, IB_UCM_DEV);
 -	class_destroy(ib_ucm_class);
 -	cdev_del(&ib_ucm_cdev);
 -	unregister_chrdev_region(IB_UCM_DEV, 1);
 +	ib_unregister_client(&ucm_client);
 +	class_unregister(&ucm_class);
 +	unregister_chrdev_region(IB_UCM_BASE_DEV, IB_UCM_MAX_DEVICES);
+ 	idr_destroy(&ctx_id_table);
  }
  
  module_init(ib_ucm_init);