From 0b9d19a18409543bee3ab700cd51117d6d064c5e Mon Sep 17 00:00:00 2001
From: Andrey Konovalov <andrey.konovalov@linaro.org>
Date: Fri, 22 Jun 2012 20:53:19 +0400
Subject: Remove references to <mach-vexpress/clkdev.h>

Fix the merge error.
arch/arm/mach-vexpress/include/mach-vexpress/clkdev.h has been
deleted by commit 95f3b85390db3d729dd338882adf33ce82e3bcc2
"ARM: vexpress: Initial common clock support".

Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
---
 arch/arm/mach-vexpress/ct-ca9x4.c | 1 -
 arch/arm/mach-vexpress/v2m.c      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index 8dda041010f1..488a6993a37a 100644
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -9,7 +9,6 @@
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
 #include <linux/clkdev.h>
-#include <mach-vexpress/clkdev.h>
 
 #include <asm/hardware/arm_timer.h>
 #include <asm/hardware/cache-l2x0.h>
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 9aa733fe621c..b1f1e56db004 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -35,7 +35,6 @@
 
 #include <mach-vexpress/ct-ca9x4.h>
 #include <mach-vexpress/motherboard.h>
-#include <mach-vexpress/clkdev.h>
 
 #include <plat-versatile/sched_clock.h>
 
-- 
cgit v1.2.3