summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-01-10 14:16:47 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-01-10 14:16:47 -0800
commitde6629eb262e0dc52a2367db38e3d2780cff5427 (patch)
tree82c2679dadc12d2b8b90bb0f475a5f733745b44b
parent4f548c25a38efb3589c4e797a6e87f6900345dc0 (diff)
parenta3869d43c9800cf39496615361c83635fa3e7c82 (diff)
downloadlinux-de6629eb262e0dc52a2367db38e3d2780cff5427.tar.bz2
Merge tag 'pci-v5.0-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas: "Fix Amlogic Meson host controller driver build failure (Corentin Labbe)" * tag 'pci-v5.0-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: amlogic: Fix build failure due to missing gpio header
-rw-r--r--drivers/pci/controller/dwc/pci-meson.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c
index 241ebe0c4505..e35e9eaa50ee 100644
--- a/drivers/pci/controller/dwc/pci-meson.c
+++ b/drivers/pci/controller/dwc/pci-meson.c
@@ -8,6 +8,7 @@
#include <linux/clk.h>
#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
#include <linux/of_device.h>
#include <linux/of_gpio.h>
#include <linux/pci.h>