Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Three trivial overlapping conflicts.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/pci/pcie/Makefile b/drivers/pci/pcie/Makefile
index f1d7bc1e5efa..efb9d2e71e9e 100644
--- a/drivers/pci/pcie/Makefile
+++ b/drivers/pci/pcie/Makefile
@@ -3,7 +3,6 @@
 # Makefile for PCI Express features and port driver
 
 pcieportdrv-y                   := portdrv_core.o portdrv_pci.o err.o
-pcieportdrv-y                   += bw_notification.o
 
 obj-$(CONFIG_PCIEPORTBUS)       += pcieportdrv.o
 
@@ -13,3 +12,4 @@ obj-$(CONFIG_PCIEAER_INJECT)	+= aer_inject.o
 obj-$(CONFIG_PCIE_PME)          += pme.o
 obj-$(CONFIG_PCIE_DPC)          += dpc.o
 obj-$(CONFIG_PCIE_PTM)          += ptm.o
+obj-$(CONFIG_PCIE_BW)           += bw_notification.o