From 457bb2354fa671a4b1a348d23014ab488a5dbede Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Tue, 18 Mar 2008 10:15:28 +0200
Subject: [PATCH] --- yaml --- r: 91309 b: refs/heads/master c:
 32ab2cb9415f341913e3f33ef7566ca6e92ef283 h: refs/heads/master i:   91307:
 90f0ba2c59e8250b87348db7c401fd425a7c4788 v: v3

---
 [refs]                                             | 2 +-
 trunk/arch/arm/mach-omap2/clock.c                  | 2 +-
 trunk/arch/arm/mach-omap2/{clock.h => clock24xx.h} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename trunk/arch/arm/mach-omap2/{clock.h => clock24xx.h} (100%)

diff --git a/[refs] b/[refs]
index 0f6ea0b41172..bd9f3979ff20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b81ad56b078a5ee7c0061b117c7287e8987d6692
+refs/heads/master: 32ab2cb9415f341913e3f33ef7566ca6e92ef283
diff --git a/trunk/arch/arm/mach-omap2/clock.c b/trunk/arch/arm/mach-omap2/clock.c
index e6e85b7b097b..5c24781f6d9b 100644
--- a/trunk/arch/arm/mach-omap2/clock.c
+++ b/trunk/arch/arm/mach-omap2/clock.c
@@ -31,7 +31,7 @@
 
 #include "prcm-regs.h"
 #include "memory.h"
-#include "clock.h"
+#include "clock24xx.h"
 
 #undef DEBUG
 
diff --git a/trunk/arch/arm/mach-omap2/clock.h b/trunk/arch/arm/mach-omap2/clock24xx.h
similarity index 100%
rename from trunk/arch/arm/mach-omap2/clock.h
rename to trunk/arch/arm/mach-omap2/clock24xx.h