[PATCH 4/7] PCI: Include <linux/pci.h>, not <asm/pci.h>
From: Bjorn Helgaas <bhelgaas@google.com>
Date: 2015-06-04 21:49:55
Also in:
linux-pci, linux-s390
Subsystem:
linux for powerpc (32-bit and 64-bit), linux for powerpc embedded mpc5xxx, s390 architecture, the rest · Maintainers:
Madhavan Srinivasan, Anatolij Gustschin, Heiko Carstens, Vasily Gorbik, Alexander Gordeev, Linus Torvalds
We already include <asm/pci.h> from <linux/pci.h>, so just include <linux/pci.h> directly. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: linuxppc-dev@lists.ozlabs.org CC: linux-s390@vger.kernel.org --- arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +- arch/s390/kernel/suspend.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index e2d401a..6eb3b2a 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c@@ -12,7 +12,7 @@ #undef DEBUG -#include <asm/pci.h> +#include <linux/pci.h> #include <asm/mpc52xx.h> #include <asm/delay.h> #include <asm/machdep.h>
diff --git a/arch/s390/kernel/suspend.c b/arch/s390/kernel/suspend.c
index d3236c9..39e2f41 100644
--- a/arch/s390/kernel/suspend.c
+++ b/arch/s390/kernel/suspend.c@@ -9,10 +9,10 @@ #include <linux/pfn.h> #include <linux/suspend.h> #include <linux/mm.h> +#include <linux/pci.h> #include <asm/ctl_reg.h> #include <asm/ipl.h> #include <asm/cio.h> -#include <asm/pci.h> #include <asm/sections.h> #include "entry.h"