From 6ca2f27eef088fc37a963533740ce04b8e46c967 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 1 Jul 2006 23:01:49 +0100
Subject: [PATCH] --- yaml --- r: 31732 b: refs/heads/master c:
 698dfe2b4513f8a13c0e082d141e8b64e63e0313 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/mach-ixp4xx/coyote-pci.c    | 1 +
 trunk/arch/arm/mach-ixp4xx/ixdp425-pci.c   | 1 +
 trunk/arch/arm/mach-ixp4xx/ixdpg425-pci.c  | 2 +-
 trunk/arch/arm/mach-ixp4xx/nas100d-pci.c   | 1 +
 trunk/arch/arm/mach-ixp4xx/nas100d-power.c | 4 ++--
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d117bfeb6004..8e37b03f6842 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae71c426ba4b5214b75bb0e624d73a4abcffbe57
+refs/heads/master: 698dfe2b4513f8a13c0e082d141e8b64e63e0313
diff --git a/trunk/arch/arm/mach-ixp4xx/coyote-pci.c b/trunk/arch/arm/mach-ixp4xx/coyote-pci.c
index e6b7fcd923fa..2cebb2878895 100644
--- a/trunk/arch/arm/mach-ixp4xx/coyote-pci.c
+++ b/trunk/arch/arm/mach-ixp4xx/coyote-pci.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
diff --git a/trunk/arch/arm/mach-ixp4xx/ixdp425-pci.c b/trunk/arch/arm/mach-ixp4xx/ixdp425-pci.c
index 8b8ca80c9449..d5156c043f0b 100644
--- a/trunk/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/trunk/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <linux/delay.h>
 
 #include <asm/mach/pci.h>
diff --git a/trunk/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/trunk/arch/arm/mach-ixp4xx/ixdpg425-pci.c
index 526fb6175bc3..ed5270800217 100644
--- a/trunk/arch/arm/mach-ixp4xx/ixdpg425-pci.c
+++ b/trunk/arch/arm/mach-ixp4xx/ixdpg425-pci.c
@@ -16,10 +16,10 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
-#include <asm/irq.h>
 
 #include <asm/mach/pci.h>
 
diff --git a/trunk/arch/arm/mach-ixp4xx/nas100d-pci.c b/trunk/arch/arm/mach-ixp4xx/nas100d-pci.c
index 2d3b770d9e82..b8ebaf4a9c8e 100644
--- a/trunk/arch/arm/mach-ixp4xx/nas100d-pci.c
+++ b/trunk/arch/arm/mach-ixp4xx/nas100d-pci.c
@@ -17,6 +17,7 @@
 
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 
 #include <asm/mach/pci.h>
 #include <asm/mach-types.h>
diff --git a/trunk/arch/arm/mach-ixp4xx/nas100d-power.c b/trunk/arch/arm/mach-ixp4xx/nas100d-power.c
index a3745ed37f9f..f58a1d05a02e 100644
--- a/trunk/arch/arm/mach-ixp4xx/nas100d-power.c
+++ b/trunk/arch/arm/mach-ixp4xx/nas100d-power.c
@@ -17,9 +17,9 @@
  *
  */
 
-#include <linux/module.h>
-#include <linux/reboot.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/module.h>
 #include <linux/reboot.h>
 
 #include <asm/mach-types.h>