diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-16 08:51:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-16 08:51:32 -0500 |
| commit | fe361cfcf40ad4612226347573a8669cd0d44799 (patch) | |
| tree | e874ef5a29c3bfe3dd67dc2d8962562c00fc8e3a /include/linux/pcieport_if.h | |
| parent | c7f2e3cd6c1f4932ccc4135d050eae3f7c7aef63 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into perf/core
Merge Linux 3.13-rc4, to refresh this branch with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/pcieport_if.h')
| -rw-r--r-- | include/linux/pcieport_if.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pcieport_if.h b/include/linux/pcieport_if.h index 9572669eea97..4f1089f2cc98 100644 --- a/include/linux/pcieport_if.h +++ b/include/linux/pcieport_if.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #define PCIE_PORT_SERVICE_VC (1 << PCIE_PORT_SERVICE_VC_SHIFT) | 23 | #define PCIE_PORT_SERVICE_VC (1 << PCIE_PORT_SERVICE_VC_SHIFT) |
| 24 | 24 | ||
| 25 | struct pcie_device { | 25 | struct pcie_device { |
| 26 | int irq; /* Service IRQ/MSI/MSI-X Vector */ | 26 | int irq; /* Service IRQ/MSI/MSI-X Vector */ |
| 27 | struct pci_dev *port; /* Root/Upstream/Downstream Port */ | 27 | struct pci_dev *port; /* Root/Upstream/Downstream Port */ |
| 28 | u32 service; /* Port service this device represents */ | 28 | u32 service; /* Port service this device represents */ |
| 29 | void *priv_data; /* Service Private Data */ | 29 | void *priv_data; /* Service Private Data */ |