From cc80be1d372f098c3fcb0924d1603dff09d28910 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sun, 26 Mar 2006 01:37:33 -0800
Subject: [PATCH] --- yaml --- r: 24059 b: refs/heads/master c:
 3ac8bf077d0f13b9c3131dd61f9f76c78c322858 h: refs/heads/master i:   24057:
 a7d9f687b940bfdec25cbf550091069da82e4daf   24055:
 27afad8d3983b03b3eed8b0e8f03b63cf547af62 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/input/touchscreen/ads7846.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f02d46599081..fa9c96feecce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a98e2f7326d626d75cab2fe108c34b733227918
+refs/heads/master: 3ac8bf077d0f13b9c3131dd61f9f76c78c322858
diff --git a/trunk/drivers/input/touchscreen/ads7846.c b/trunk/drivers/input/touchscreen/ads7846.c
index a81f987978c8..46d1fec2cfd8 100644
--- a/trunk/drivers/input/touchscreen/ads7846.c
+++ b/trunk/drivers/input/touchscreen/ads7846.c
@@ -23,7 +23,7 @@
 #include <linux/slab.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
-#include <linux/interrupt.h>
+#include <asm/irq.h>
 
 #ifdef	CONFIG_ARM
 #include <asm/mach-types.h>