From 7ad0b308344c45c0ca420bfa52286f035880adbe Mon Sep 17 00:00:00 2001
From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Thu, 31 May 2007 12:27:14 +0100
Subject: [PATCH] --- yaml --- r: 59239 b: refs/heads/master c:
 ddaca4a26efc0716708f027914bf5508e2d86cc7 h: refs/heads/master i:   59237:
 67a51237b8700bf3c05bb5d5ab90c889a09256f0   59235:
 e75be221548058dff7b0a9f7851143e504082aca   59231:
 65909799530100c10cf23375dd523834b144668c v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/mach-ixp4xx/gtwx5715-pci.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fe943f9f9f9e..2828673dfeb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcdeeb21c010e9b5cb2e91f865cd5bebb65bc31f
+refs/heads/master: ddaca4a26efc0716708f027914bf5508e2d86cc7
diff --git a/trunk/arch/arm/mach-ixp4xx/gtwx5715-pci.c b/trunk/arch/arm/mach-ixp4xx/gtwx5715-pci.c
index a66484b63d36..289d29392736 100644
--- a/trunk/arch/arm/mach-ixp4xx/gtwx5715-pci.c
+++ b/trunk/arch/arm/mach-ixp4xx/gtwx5715-pci.c
@@ -25,17 +25,14 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/irq.h>
+
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
 #include <asm/arch/gtwx5715.h>
 #include <asm/mach/pci.h>
 
-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