Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c20f5c59 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'integrator-pciv3-delete' of... 

Merge tag 'integrator-pciv3-delete' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc

Pull "Delete old PCIv3 driver" from Linus Walleij:

This deletes the old PCIv3 driver in the Integrator machine.
It has been superceded by a modernized driver in the PCI
subsystem host/ directory.

* tag 'integrator-pciv3-delete' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: integrator: Delete the V3 PCI driver
parents e7ffa44d 70f8e9cc

arch/arm/mach-integrator/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -7,6 +7,4 @@ 
obj-y					:= core.o lm.o

obj-$(CONFIG_ARCH_INTEGRATOR_AP)	+= integrator_ap.o

obj-$(CONFIG_ARCH_INTEGRATOR_CP)	+= integrator_cp.o



obj-$(CONFIG_PCI)			+= pci_v3.o

obj-$(CONFIG_INTEGRATOR_IMPD1)		+= impd1.o

arch/arm/mach-integrator/integrator_ap.c

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include "hardware.h"

#include "cm.h"

#include "common.h"

#include "pci_v3.h"

#include "lm.h"



/* Regmap to the AP system controller */
@@ -74,7 +73,6 @@ static struct map_desc ap_io_desc[] __initdata __maybe_unused = { 
static void __init ap_map_io(void)

{

	iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc));

	pci_v3_early_init();

}



#ifdef CONFIG_PM

arch/arm/mach-integrator/pci_v3.c

deleted100644 → 0
+0 −900

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-integrator/pci_v3.h

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
/* Simple oneliner include to the PCIv3 early init */

#ifdef CONFIG_PCI

extern int pci_v3_early_init(void);

#else

static inline int pci_v3_early_init(void)

{

	return 0;

}

#endif