Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/mux.h b/arch/arm/plat-omap/include/mach/mux.h
similarity index 99%
rename from include/asm-arm/arch-omap/mux.h
rename to arch/arm/plat-omap/include/mach/mux.h
index 7a51aa099405aac2dd680e926731b330a3104d3f..5670d563f378893cf246468e0eb30ddcba245098 100644 (file)
--- a/include/asm-arm/arch-omap/mux.h
+++ b/arch/arm/plat-omap/include/mach/mux.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/mux.h
+ * arch/arm/plat-omap/include/mach/mux.h
  *
  * Table of the Omap register configurations for the FUNC_MUX and
  * PULL_DWN combinations.