PCI: Include <linux/pci.h>, not <asm/pci.h>

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

diff --cc arch/powerpc/platforms/52xx/mpc52xx_pci.c
Simple merge

diff --cc arch/s390/kernel/suspend.c
Simple merge