From f4bc4f0ab4081b5bf99c92663877a41adf8c843a Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 29 Jan 2013 17:14:18 +0100 Subject: ARM: integrator: merge PCIv3 driver into one file The Integrator/AP PCI bridget, "v3" is contained in two files, where pci.c is a socket container to plug in the v3 device. However to transition the v3 to enable device tree probing, it need to be converted to a platform device (so that it can have a device node in the device tree) and then we want the PCI driver in a single file, as any other device driver, so we can handle variants using compatible strings and device name, and get the base address etc from resources connected to the device node. To move toward this goal we consolidate all code in the pci_v3.c file. Acked-by: Arnd Bergmann Signed-off-by: Linus Walleij --- arch/arm/include/asm/mach/pci.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'arch/arm/include/asm/mach') diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index 038d657e5c2..a1c90d7feb0 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -106,9 +106,4 @@ extern struct pci_ops via82c505_ops; extern int via82c505_setup(int nr, struct pci_sys_data *); extern void via82c505_init(void *sysdata); -extern struct pci_ops pci_v3_ops; -extern int pci_v3_setup(int nr, struct pci_sys_data *); -extern void pci_v3_preinit(void); -extern void pci_v3_postinit(void); - #endif /* __ASM_MACH_PCI_H */ -- cgit v1.2.3-70-g09d2