From 5e2345f7600cddf3113adeab897d060022c14639 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 1 Jul 2006 22:32:20 +0100
Subject: [PATCH] --- yaml --- r: 31719 b: refs/heads/master c:
 1623dee87b4b244099eb79adc87e71e3961b86d7 h: refs/heads/master i:   31717:
 1e63cedd0d577bf3ef11162c485f90eb4eb0a207   31715:
 8b7c5a5ae87456879e97d2010f020550b27b8970   31711:
 a87f16658700e61174d2d4268b19f3e833ff1f94 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-pxa/idp.c        | 1 +
 trunk/arch/arm/mach-pxa/sharpsl_pm.c | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ed011abfa0f6..421ec775adc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 427923d10c2998f05ce06c5683a0f80c8be5b744
+refs/heads/master: 1623dee87b4b244099eb79adc87e71e3961b86d7
diff --git a/trunk/arch/arm/mach-pxa/idp.c b/trunk/arch/arm/mach-pxa/idp.c
index 347b9dea24c6..6914d22bc20f 100644
--- a/trunk/arch/arm/mach-pxa/idp.c
+++ b/trunk/arch/arm/mach-pxa/idp.c
@@ -18,6 +18,7 @@
 
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/platform_device.h>
 #include <linux/fb.h>
 
diff --git a/trunk/arch/arm/mach-pxa/sharpsl_pm.c b/trunk/arch/arm/mach-pxa/sharpsl_pm.c
index 0f1648780c41..1e5e6ca693ee 100644
--- a/trunk/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/trunk/arch/arm/mach-pxa/sharpsl_pm.c
@@ -18,11 +18,11 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/platform_device.h>
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/irq.h>
 #include <asm/apm.h>
 #include <asm/arch/pm.h>
 #include <asm/arch/pxa-regs.h>