diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-11-14 13:11:26 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-11-14 13:11:26 -0500 |
| commit | 9af21ac53f970b1be81c1e1ca629da74a771a036 (patch) | |
| tree | 02b3142b7e7d1a40d4279543c471ef350a332f72 | |
| parent | 104d1e40cfcd69934f3f57c6abf13980eb703feb (diff) | |
| parent | f05f7355de3e66438619c97c612d63cc8a1be125 (diff) | |
Merge branch 'pci/switchtec' into next
* pci/switchtec:
switchtec: Make struct event_regs static
| -rw-r--r-- | drivers/pci/switch/switchtec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c index af81b2dec42e..da45dbea20ce 100644 --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c | |||
| @@ -943,7 +943,7 @@ static u32 __iomem *pff_ev_reg(struct switchtec_dev *stdev, | |||
| 943 | #define EV_PAR(i, r)[i] = {offsetof(struct part_cfg_regs, r), part_ev_reg} | 943 | #define EV_PAR(i, r)[i] = {offsetof(struct part_cfg_regs, r), part_ev_reg} |
| 944 | #define EV_PFF(i, r)[i] = {offsetof(struct pff_csr_regs, r), pff_ev_reg} | 944 | #define EV_PFF(i, r)[i] = {offsetof(struct pff_csr_regs, r), pff_ev_reg} |
| 945 | 945 | ||
| 946 | const struct event_reg { | 946 | static const struct event_reg { |
| 947 | size_t offset; | 947 | size_t offset; |
| 948 | u32 __iomem *(*map_reg)(struct switchtec_dev *stdev, | 948 | u32 __iomem *(*map_reg)(struct switchtec_dev *stdev, |
| 949 | size_t offset, int index); | 949 | size_t offset, int index); |