From ddaca4a26efc0716708f027914bf5508e2d86cc7 Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Thu, 31 May 2007 12:27:14 +0100 Subject: [ARM] 4408/2: Fixup support for gtwx5715 ixp4xx board This patch fixes up compiling of the gtwx5715 board setup code, which has apparently been broken since 2.6.18 and the generic IRQ changes. In addition it removes some unecessary extern declarations in the gtwx5715-pci.c file. Signed-off-by: Michael-Luke Jones Signed-off-by: Russell King --- arch/arm/mach-ixp4xx/gtwx5715-pci.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'arch/arm/mach-ixp4xx/gtwx5715-pci.c') diff --git a/arch/arm/mach-ixp4xx/gtwx5715-pci.c b/arch/arm/mach-ixp4xx/gtwx5715-pci.c index a66484b63d36..289d29392736 100644 --- a/arch/arm/mach-ixp4xx/gtwx5715-pci.c +++ b/arch/arm/mach-ixp4xx/gtwx5715-pci.c @@ -25,17 +25,14 @@ #include #include #include +#include + #include #include #include #include #include -extern void ixp4xx_pci_preinit(void); -extern int ixp4xx_setup(int nr, struct pci_sys_data *sys); -extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys); - - /* * The exact GPIO pins and IRQs are defined in arch-ixp4xx/gtwx5715.h * Slot 0 isn't actually populated with a card connector but -- cgit v1.2.2 From eab03b3f6609518a80eae4d1f5d78ff8f44e116a Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 3 Jun 2007 18:50:49 +0100 Subject: [ARM] If linux/irq.h is included, asm/irq.h is not required Signed-off-by: Russell King --- arch/arm/mach-ixp4xx/gtwx5715-pci.c | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-ixp4xx/gtwx5715-pci.c') diff --git a/arch/arm/mach-ixp4xx/gtwx5715-pci.c b/arch/arm/mach-ixp4xx/gtwx5715-pci.c index 289d29392736..0d5a42455820 100644 --- a/arch/arm/mach-ixp4xx/gtwx5715-pci.c +++ b/arch/arm/mach-ixp4xx/gtwx5715-pci.c @@ -29,7 +29,6 @@ #include #include -#include #include #include -- cgit v1.2.2