Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/bci.h b/arch/arm/plat-omap/include/mach/bci.h
similarity index 90%
rename from include/asm-arm/arch-omap/bci.h
rename to arch/arm/plat-omap/include/mach/bci.h
index 51eb8a572923a25990aeefd304f326a4676a1db6..9baf59e24c5faf806a3c0971d10d21012b7184d0 100644 (file)
--- a/include/asm-arm/arch-omap/bci.h
+++ b/arch/arm/plat-omap/include/mach/bci.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-omap/bci.h
+ *  arch/arm/plat-omap/include/mach/bci.h
  *
  *  Copyright (C) 2008 Texas Instruments, Inc.
  *