Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/timex.h b/arch/arm/plat-omap/include/mach/timex.h
similarity index 97%
rename from include/asm-arm/arch-omap/timex.h
rename to arch/arm/plat-omap/include/mach/timex.h
index f1808cdcc08d63507aeba0934101bd69c98d78b3..b3f5ea96e056a31d5c203a4d09ad8d6ffd0b5512 100644 (file)
--- a/include/asm-arm/arch-omap/timex.h
+++ b/arch/arm/plat-omap/include/mach/timex.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/timex.h
+ * arch/arm/plat-omap/include/mach/timex.h
  *
  * Copyright (C) 2000 RidgeRun, Inc.
  * Author:  Greg Lonnon <glonnon@ridgerun.com>