ARM: OMAP: Replace mach-omap/omap2 with mach-omap2

- Update file headers with correct file paths.

Signed-off-by: Trilok Soni <soni.trilok@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index 5e1cada..5488961 100644 (file)
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2005,2006 Samsung Electronics
  * Author: Kyungmin Park <kyungmin.park@samsung.com>
  *
- * Modified from mach-omap/omap2/board-h4.c
+ * Modified from mach-omap2/board-h4.c
  *
  * Code for apollon OMAP2 board. Should work on many OMAP2 systems where
  * the bootloader passes the board-specific data to the kernel.

diff --cc arch/arm/mach-omap2/board-n800-audio.c
Simple merge

diff --cc arch/arm/mach-omap2/board-n800-flash.c
Simple merge

diff --cc arch/arm/mach-omap2/board-n800-usb.c
Simple merge

diff --cc arch/arm/mach-omap2/board-n800.c
Simple merge

diff --cc arch/arm/mach-omap2/usb-tusb6010.c
Simple merge