Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / ehca / ehca_classes.h

diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h
index 0f7a55d35ea7e1f6e4dfd385c12108d5638fe576..87f12d4312a70be74fd5d68196793ec869cdf033 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_classes.h
+++ b/drivers/infiniband/hw/ehca/ehca_classes.h
@@ -95,7 +95,6 @@ struct ehca_sma_attr {
 struct ehca_sport {
        struct ib_cq *ibcq_aqp1;
        struct ib_qp *ibqp_aqp1;
-       enum ib_rate  rate;
        enum ib_port_state port_state;
        struct ehca_sma_attr saved_attr;
 };
@@ -107,7 +106,7 @@ struct ehca_sport {
 
 struct ehca_shca {
        struct ib_device ib_device;
-       struct ibmebus_dev *ibmebus_dev;
+       struct of_device *ofdev;
        u8 num_ports;
        int hw_level;
        struct list_head shca_list;
@@ -323,7 +322,6 @@ extern int ehca_static_rate;
 extern int ehca_port_act_time;
 extern int ehca_use_hp_mr;
 extern int ehca_scaling_code;
-extern int ehca_mr_largepage;
 
 struct ipzu_queue_resp {
        u32 qe_size;      /* queue entry size */