From ba16a205fc0885d975b99bbb0cf13d00c7dd287a Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Thu, 14 Jun 2012 11:26:46 +0800
Subject: [PATCH] --- yaml --- r: 313510 b: refs/heads/master c:
 69fcbc74bb7a8b3c86e15f27b74ee512633ffcc6 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-imx/mach-apf9328.c  | 1 -
 trunk/arch/arm/mach-imx/mach-mx1ads.c   | 1 -
 trunk/arch/arm/mach-imx/mach-mx27_3ds.c | 1 -
 trunk/arch/arm/mach-imx/mach-mx31lite.c | 1 -
 trunk/arch/arm/mach-imx/mach-mx35_3ds.c | 1 -
 trunk/arch/arm/mach-imx/mach-pca100.c   | 1 -
 trunk/arch/arm/mach-imx/mach-qong.c     | 1 -
 trunk/arch/arm/mach-imx/mach-scb9328.c  | 1 -
 trunk/arch/arm/mach-imx/mach-vpr200.c   | 1 -
 trunk/arch/arm/mach-imx/mm-imx1.c       | 1 -
 trunk/arch/arm/mach-imx/mm-imx21.c      | 1 -
 trunk/arch/arm/mach-imx/mm-imx25.c      | 1 -
 trunk/arch/arm/mach-imx/mm-imx27.c      | 1 -
 trunk/arch/arm/mach-imx/mm-imx3.c       | 1 -
 15 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 225f8922f01d..89c5e2c86f05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6387f8fcb6974499c3e179d3b0f369e62969300f
+refs/heads/master: 69fcbc74bb7a8b3c86e15f27b74ee512633ffcc6
diff --git a/trunk/arch/arm/mach-imx/mach-apf9328.c b/trunk/arch/arm/mach-imx/mach-apf9328.c
index 5062fcb88498..7b99a79722b6 100644
--- a/trunk/arch/arm/mach-imx/mach-apf9328.c
+++ b/trunk/arch/arm/mach-imx/mach-apf9328.c
@@ -27,7 +27,6 @@
 
 #include <mach/common.h>
 #include <mach/hardware.h>
-#include <mach/irqs.h>
 #include <mach/iomux-mx1.h>
 
 #include "devices-imx1.h"
diff --git a/trunk/arch/arm/mach-imx/mach-mx1ads.c b/trunk/arch/arm/mach-imx/mach-mx1ads.c
index 7274e7928136..667f359a2e8b 100644
--- a/trunk/arch/arm/mach-imx/mach-mx1ads.c
+++ b/trunk/arch/arm/mach-imx/mach-mx1ads.c
@@ -26,7 +26,6 @@
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx1.h>
-#include <mach/irqs.h>
 
 #include "devices-imx1.h"
 
diff --git a/trunk/arch/arm/mach-imx/mach-mx27_3ds.c b/trunk/arch/arm/mach-imx/mach-mx27_3ds.c
index eeff0b6aaba3..71f7c58ee4b6 100644
--- a/trunk/arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/trunk/arch/arm/mach-imx/mach-mx27_3ds.c
@@ -40,7 +40,6 @@
 #include <mach/common.h>
 #include <mach/iomux-mx27.h>
 #include <mach/ulpi.h>
-#include <mach/irqs.h>
 #include <mach/3ds_debugboard.h>
 
 #include "devices-imx27.h"
diff --git a/trunk/arch/arm/mach-imx/mach-mx31lite.c b/trunk/arch/arm/mach-imx/mach-mx31lite.c
index 4977378d2f60..c8785b39eaed 100644
--- a/trunk/arch/arm/mach-imx/mach-mx31lite.c
+++ b/trunk/arch/arm/mach-imx/mach-mx31lite.c
@@ -43,7 +43,6 @@
 #include <mach/common.h>
 #include <mach/board-mx31lite.h>
 #include <mach/iomux-mx3.h>
-#include <mach/irqs.h>
 #include <mach/ulpi.h>
 
 #include "devices-imx31.h"
diff --git a/trunk/arch/arm/mach-imx/mach-mx35_3ds.c b/trunk/arch/arm/mach-imx/mach-mx35_3ds.c
index 596f237c0d0e..e78525405c98 100644
--- a/trunk/arch/arm/mach-imx/mach-mx35_3ds.c
+++ b/trunk/arch/arm/mach-imx/mach-mx35_3ds.c
@@ -46,7 +46,6 @@
 #include <mach/hardware.h>
 #include <mach/common.h>
 #include <mach/iomux-mx35.h>
-#include <mach/irqs.h>
 #include <mach/3ds_debugboard.h>
 #include <video/platform_lcd.h>
 
diff --git a/trunk/arch/arm/mach-imx/mach-pca100.c b/trunk/arch/arm/mach-imx/mach-pca100.c
index 8b1dfa277fd5..d620a958e4f9 100644
--- a/trunk/arch/arm/mach-imx/mach-pca100.c
+++ b/trunk/arch/arm/mach-imx/mach-pca100.c
@@ -36,7 +36,6 @@
 #include <mach/hardware.h>
 #include <mach/iomux-mx27.h>
 #include <asm/mach/time.h>
-#include <mach/irqs.h>
 #include <mach/ulpi.h>
 
 #include "devices-imx27.h"
diff --git a/trunk/arch/arm/mach-imx/mach-qong.c b/trunk/arch/arm/mach-imx/mach-qong.c
index b6f11d25f25a..39ceb8c10d5c 100644
--- a/trunk/arch/arm/mach-imx/mach-qong.c
+++ b/trunk/arch/arm/mach-imx/mach-qong.c
@@ -22,7 +22,6 @@
 #include <linux/gpio.h>
 
 #include <mach/hardware.h>
-#include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
diff --git a/trunk/arch/arm/mach-imx/mach-scb9328.c b/trunk/arch/arm/mach-imx/mach-scb9328.c
index 500116498698..67ff38e9a3ca 100644
--- a/trunk/arch/arm/mach-imx/mach-scb9328.c
+++ b/trunk/arch/arm/mach-imx/mach-scb9328.c
@@ -22,7 +22,6 @@
 
 #include <mach/common.h>
 #include <mach/hardware.h>
-#include <mach/irqs.h>
 #include <mach/iomux-mx1.h>
 
 #include "devices-imx1.h"
diff --git a/trunk/arch/arm/mach-imx/mach-vpr200.c b/trunk/arch/arm/mach-imx/mach-vpr200.c
index 1aa562285960..09864bba3820 100644
--- a/trunk/arch/arm/mach-imx/mach-vpr200.c
+++ b/trunk/arch/arm/mach-imx/mach-vpr200.c
@@ -31,7 +31,6 @@
 #include <mach/hardware.h>
 #include <mach/common.h>
 #include <mach/iomux-mx35.h>
-#include <mach/irqs.h>
 
 #include <linux/i2c.h>
 #include <linux/i2c/at24.h>
diff --git a/trunk/arch/arm/mach-imx/mm-imx1.c b/trunk/arch/arm/mach-imx/mm-imx1.c
index fcafd3dafb8c..6d60d51868bc 100644
--- a/trunk/arch/arm/mach-imx/mm-imx1.c
+++ b/trunk/arch/arm/mach-imx/mm-imx1.c
@@ -24,7 +24,6 @@
 
 #include <mach/common.h>
 #include <mach/hardware.h>
-#include <mach/irqs.h>
 #include <mach/iomux-v1.h>
 
 static struct map_desc imx_io_desc[] __initdata = {
diff --git a/trunk/arch/arm/mach-imx/mm-imx21.c b/trunk/arch/arm/mach-imx/mm-imx21.c
index 5f43905e5290..d056dad0940d 100644
--- a/trunk/arch/arm/mach-imx/mm-imx21.c
+++ b/trunk/arch/arm/mach-imx/mm-imx21.c
@@ -26,7 +26,6 @@
 #include <mach/devices-common.h>
 #include <asm/pgtable.h>
 #include <asm/mach/map.h>
-#include <mach/irqs.h>
 #include <mach/iomux-v1.h>
 
 /* MX21 memory map definition */
diff --git a/trunk/arch/arm/mach-imx/mm-imx25.c b/trunk/arch/arm/mach-imx/mm-imx25.c
index 6ff37140a4f8..388928fdb11a 100644
--- a/trunk/arch/arm/mach-imx/mm-imx25.c
+++ b/trunk/arch/arm/mach-imx/mm-imx25.c
@@ -29,7 +29,6 @@
 #include <mach/hardware.h>
 #include <mach/mx25.h>
 #include <mach/iomux-v3.h>
-#include <mach/irqs.h>
 
 /*
  * This table defines static virtual address mappings for I/O regions.
diff --git a/trunk/arch/arm/mach-imx/mm-imx27.c b/trunk/arch/arm/mach-imx/mm-imx27.c
index 25662558e018..e7e24afc45ed 100644
--- a/trunk/arch/arm/mach-imx/mm-imx27.c
+++ b/trunk/arch/arm/mach-imx/mm-imx27.c
@@ -26,7 +26,6 @@
 #include <mach/devices-common.h>
 #include <asm/pgtable.h>
 #include <asm/mach/map.h>
-#include <mach/irqs.h>
 #include <mach/iomux-v1.h>
 
 /* MX27 memory map definition */
diff --git a/trunk/arch/arm/mach-imx/mm-imx3.c b/trunk/arch/arm/mach-imx/mm-imx3.c
index 967ed5b35a45..3ccd167a3e2d 100644
--- a/trunk/arch/arm/mach-imx/mm-imx3.c
+++ b/trunk/arch/arm/mach-imx/mm-imx3.c
@@ -30,7 +30,6 @@
 #include <mach/devices-common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-v3.h>
-#include <mach/irqs.h>
 
 #include "crmregs-imx3.h"