--- zzzz-none-000/linux-2.6.19.2/drivers/infiniband/hw/ehca/ehca_hca.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/infiniband/hw/ehca/ehca_hca.c	2007-01-11 07:38:19.000000000 +0000
@@ -40,7 +40,6 @@
  */
 
 #include "ehca_tools.h"
-#include "ehca_iverbs.h"
 #include "hcp_if.h"
 
 int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props)
@@ -50,7 +49,7 @@
 					      ib_device);
 	struct hipz_query_hca *rblock;
 
-	rblock = ehca_alloc_fw_ctrlblock();
+	rblock = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);
 	if (!rblock) {
 		ehca_err(&shca->ib_device, "Can't allocate rblock memory.");
 		return -ENOMEM;
@@ -97,7 +96,7 @@
 		= min_t(int, rblock->max_total_mcast_qp_attach, INT_MAX);
 
 query_device1:
-	ehca_free_fw_ctrlblock(rblock);
+	kfree(rblock);
 
 	return ret;
 }
@@ -110,7 +109,7 @@
 					      ib_device);
 	struct hipz_query_port *rblock;
 
-	rblock = ehca_alloc_fw_ctrlblock();
+	rblock = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);
 	if (!rblock) {
 		ehca_err(&shca->ib_device, "Can't allocate rblock memory.");
 		return -ENOMEM;
@@ -163,7 +162,7 @@
 	props->active_speed    = 0x1;
 
 query_port1:
-	ehca_free_fw_ctrlblock(rblock);
+	kfree(rblock);
 
 	return ret;
 }
@@ -179,7 +178,7 @@
 		return -EINVAL;
 	}
 
-	rblock = ehca_alloc_fw_ctrlblock();
+	rblock = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);
 	if (!rblock) {
 		ehca_err(&shca->ib_device,  "Can't allocate rblock memory.");
 		return -ENOMEM;
@@ -194,7 +193,7 @@
 	memcpy(pkey, &rblock->pkey_entries + index, sizeof(u16));
 
 query_pkey1:
-	ehca_free_fw_ctrlblock(rblock);
+	kfree(rblock);
 
 	return ret;
 }
@@ -212,7 +211,7 @@
 		return -EINVAL;
 	}
 
-	rblock = ehca_alloc_fw_ctrlblock();
+	rblock = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);
 	if (!rblock) {
 		ehca_err(&shca->ib_device, "Can't allocate rblock memory.");
 		return -ENOMEM;
@@ -228,7 +227,7 @@
 	memcpy(&gid->raw[8], &rblock->guid_entries[index], sizeof(u64));
 
 query_gid1:
-	ehca_free_fw_ctrlblock(rblock);
+	kfree(rblock);
 
 	return ret;
 }