Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / clock.h

diff --git a/include/asm-arm/arch-omap/clock.h b/arch/arm/plat-omap/include/mach/clock.h
similarity index 99%
rename from include/asm-arm/arch-omap/clock.h
rename to arch/arm/plat-omap/include/mach/clock.h
index 34f122c0a3c019bdd84c0b6346f6953feb70c9bd..c6762e901ba3f7df92b49f25dc78242b70649ad5 100644 (file)
--- a/include/asm-arm/arch-omap/clock.h
+++ b/arch/arm/plat-omap/include/mach/clock.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-omap/clock.h
+ *  arch/arm/plat-omap/include/mach/clock.h
  *
  *  Copyright (C) 2004 - 2005 Nokia corporation
  *  Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>