diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /drivers/misc/cxl/vphb.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'drivers/misc/cxl/vphb.c')
| -rw-r--r-- | drivers/misc/cxl/vphb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/cxl/vphb.c b/drivers/misc/cxl/vphb.c index dee8def1c193..7ada5f1b7bb6 100644 --- a/drivers/misc/cxl/vphb.c +++ b/drivers/misc/cxl/vphb.c | |||
| @@ -221,7 +221,7 @@ int cxl_pci_vphb_add(struct cxl_afu *afu) | |||
| 221 | /* Setup the PHB using arch provided callback */ | 221 | /* Setup the PHB using arch provided callback */ |
| 222 | phb->ops = &cxl_pcie_pci_ops; | 222 | phb->ops = &cxl_pcie_pci_ops; |
| 223 | phb->cfg_addr = NULL; | 223 | phb->cfg_addr = NULL; |
| 224 | phb->cfg_data = 0; | 224 | phb->cfg_data = NULL; |
| 225 | phb->private_data = afu; | 225 | phb->private_data = afu; |
| 226 | phb->controller_ops = cxl_pci_controller_ops; | 226 | phb->controller_ops = cxl_pci_controller_ops; |
| 227 | 227 | ||