From 506685973dbfe5a98f727f291ba4672cc51c5bc9 Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas@tomweber.eu>
Date: Tue, 10 Apr 2012 15:11:01 +0200
Subject: [PATCH] --- yaml --- r: 309561 b: refs/heads/master c:
 c533f32e1ac440b8840159f89ece8c9cca2422b5 h: refs/heads/master i:   309559:
 e09a8066a9a339052899d4bc192f8d3e7c62c537 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-vexpress/v2m.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a83912e00496..ee2df2eb7eaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e29b65dbc5d0431e8f063fab19fafaaa744d55ce
+refs/heads/master: c533f32e1ac440b8840159f89ece8c9cca2422b5
diff --git a/trunk/arch/arm/mach-vexpress/v2m.c b/trunk/arch/arm/mach-vexpress/v2m.c
index 47cdcca5a7e7..e769ab612627 100644
--- a/trunk/arch/arm/mach-vexpress/v2m.c
+++ b/trunk/arch/arm/mach-vexpress/v2m.c
@@ -14,7 +14,6 @@
 #include <linux/ata_platform.h>
 #include <linux/smsc911x.h>
 #include <linux/spinlock.h>
-#include <linux/device.h>
 #include <linux/usb/isp1760.h>
 #include <linux/clkdev.h>
 #include <linux/mtd/physmap.h>
@@ -29,7 +28,6 @@
 #include <asm/hardware/gic.h>
 #include <asm/hardware/timer-sp.h>
 #include <asm/hardware/sp810.h>
-#include <asm/hardware/gic.h>
 
 #include <mach/ct-ca9x4.h>
 #include <mach/motherboard.h>