Commit 9af21ac5 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/switchtec' into next 

* pci/switchtec:
  switchtec: Make struct event_regs static
parents 104d1e40 f05f7355

drivers/pci/switch/switchtec.c

+1 −1
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ static u32 __iomem *pff_ev_reg(struct switchtec_dev *stdev, 
#define EV_PAR(i, r)[i] = {offsetof(struct part_cfg_regs, r), part_ev_reg}

#define EV_PFF(i, r)[i] = {offsetof(struct pff_csr_regs, r), pff_ev_reg}



const struct event_reg {

static const struct event_reg {

	size_t offset;

	u32 __iomem *(*map_reg)(struct switchtec_dev *stdev,

				size_t offset, int index);