diff options
author | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 12:52:14 +0800 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 12:52:14 +0800 |
commit | 111b23cf895b5cbcdc1b2c6580be1bb78a577d05 (patch) | |
tree | 89b840115ccd753216ba0b26e587e52699b99310 /drivers/infiniband/hw/qib/qib.h | |
parent | 6a6bcf08e5d1834447655a762dfaf552b675cc54 (diff) | |
parent | 53daf9383f34d7bf61358a37449fb4d59fbdafc2 (diff) |
Merge branches 'release' and 'thermal-soc' of .git into next
Diffstat (limited to 'drivers/infiniband/hw/qib/qib.h')
-rw-r--r-- | drivers/infiniband/hw/qib/qib.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h index ffd48bfc4923..7df16f74bb45 100644 --- a/drivers/infiniband/hw/qib/qib.h +++ b/drivers/infiniband/hw/qib/qib.h @@ -903,7 +903,7 @@ struct qib_devdata { /* PCI Device ID (here for NodeInfo) */ u16 deviceid; /* for write combining settings */ - unsigned long wc_cookie; + int wc_cookie; unsigned long wc_base; unsigned long wc_len; @@ -1136,7 +1136,6 @@ extern struct qib_devdata *qib_lookup(int unit); extern u32 qib_cpulist_count; extern unsigned long *qib_cpulist; -extern unsigned qib_wc_pat; extern unsigned qib_cc_table_size; int qib_init(struct qib_devdata *, int); int init_chip_wc_pat(struct qib_devdata *dd, u32); |