From 8b7c5a5ae87456879e97d2010f020550b27b8970 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 1 Jul 2006 22:32:16 +0100
Subject: [PATCH] --- yaml --- r: 31715 b: refs/heads/master c:
 ff632054ced5e1a8a28e7196c013e5af37895f7b h: refs/heads/master i:   31713:
 42f5f6996dc2fef9677ba2d5d10d7d52dfed4b57   31711:
 a87f16658700e61174d2d4268b19f3e833ff1f94 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/pcmcia/soc_common.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0df9308aa01a..d6f3e1ee1898 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6e3c3be8add9167c36c27f54954dfd8d7533543
+refs/heads/master: ff632054ced5e1a8a28e7196c013e5af37895f7b
diff --git a/trunk/drivers/pcmcia/soc_common.c b/trunk/drivers/pcmcia/soc_common.c
index ecf65d4c4e95..8ef3f91310d2 100644
--- a/trunk/drivers/pcmcia/soc_common.c
+++ b/trunk/drivers/pcmcia/soc_common.c
@@ -38,12 +38,12 @@
 #include <linux/timer.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/spinlock.h>
 #include <linux/cpufreq.h>
 
 #include <asm/hardware.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/system.h>
 
 #include "soc_common.h"