diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-01-15 12:10:38 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-01-15 12:10:38 -0600 |
| commit | 67b9ef22c68c4f7761309864d18da85da560f882 (patch) | |
| tree | a161ffe97702cb7735800dcd8d4b5e1c031ba353 /drivers/pci/controller/dwc | |
| parent | 1b6069f51ef02618f89fc20a630762ac38420a8d (diff) | |
| parent | 6797e4da2dd1e2c8dc8cec73447c77abe2a7655b (diff) | |
Merge branch 'pci/controller/rcar'
- Replace of_device.h with explicit of.h include to untangle header usage
(Rob Herring)
- Add DT and driver support for optional miniPCIe 1.5v and 3.3v regulators
on KingFisher (Wolfram Sang)
* pci/controller/rcar:
PCI: rcar-host: Add support for optional regulators
dt-bindings: PCI: rcar-pci-host: Add optional regulators
PCI: rcar-gen4: Replace of_device.h with explicit of.h include
Diffstat (limited to 'drivers/pci/controller/dwc')
| -rw-r--r-- | drivers/pci/controller/dwc/pcie-rcar-gen4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/controller/dwc/pcie-rcar-gen4.c b/drivers/pci/controller/dwc/pcie-rcar-gen4.c index a1eb10e878f1..b0f5df00a7de 100644 --- a/drivers/pci/controller/dwc/pcie-rcar-gen4.c +++ b/drivers/pci/controller/dwc/pcie-rcar-gen4.c @@ -8,7 +8,7 @@ #include <linux/interrupt.h> #include <linux/io.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/pci.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> |