diff options
author | Michael-Luke Jones <mlj28@cam.ac.uk> | 2007-05-31 07:27:14 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-12 06:12:15 -0400 |
commit | ddaca4a26efc0716708f027914bf5508e2d86cc7 (patch) | |
tree | 79405a10b410505300723ccaced6c7a80560518b /arch/arm | |
parent | dcdeeb21c010e9b5cb2e91f865cd5bebb65bc31f (diff) |
[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 <mlj28@cam.ac.uk>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-ixp4xx/gtwx5715-pci.c | 7 |
1 files changed, 2 insertions, 5 deletions
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 @@ | |||
25 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
27 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
28 | #include <linux/irq.h> | ||
29 | |||
28 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
29 | #include <asm/hardware.h> | 31 | #include <asm/hardware.h> |
30 | #include <asm/irq.h> | 32 | #include <asm/irq.h> |
31 | #include <asm/arch/gtwx5715.h> | 33 | #include <asm/arch/gtwx5715.h> |
32 | #include <asm/mach/pci.h> | 34 | #include <asm/mach/pci.h> |
33 | 35 | ||
34 | extern void ixp4xx_pci_preinit(void); | ||
35 | extern int ixp4xx_setup(int nr, struct pci_sys_data *sys); | ||
36 | extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys); | ||
37 | |||
38 | |||
39 | /* | 36 | /* |
40 | * The exact GPIO pins and IRQs are defined in arch-ixp4xx/gtwx5715.h | 37 | * The exact GPIO pins and IRQs are defined in arch-ixp4xx/gtwx5715.h |
41 | * Slot 0 isn't actually populated with a card connector but | 38 | * Slot 0 isn't actually populated with a card connector but |