ARM: OMAP: Fix a warning and cosmetic fixes

Fix a warning and cosmetic fixes

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index d273e6567b1935ed74454fabcc60c9a687d5789b..c8e6ef81fdc6e28a9a1294bd5785776250a4897e 100644 (file)
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/omap1/devices.c
+ * linux/arch/arm/mach-omap1/devices.c
  *
  * OMAP1 platform device setup/initialization
  *

diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c
index a708296584aa7d511d049e4471f53572e94b38ba..986c3b7e09bbf464d35052febf3d62e5c0842d09 100644 (file)
--- a/arch/arm/mach-omap1/id.c
+++ b/arch/arm/mach-omap1/id.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/omap1/id.c
+ * linux/arch/arm/mach-omap1/id.c
  *
  * OMAP1 CPU identification code
  *

diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c
index 8d3601467b9b9a3a50487c15741666bfe6be9d34..6981a2a6aa2eda6fc72c7a683e2086bd61417f8f 100644 (file)
--- a/arch/arm/mach-omap1/io.c
+++ b/arch/arm/mach-omap1/io.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/omap1/io.c
+ * linux/arch/arm/mach-omap1/io.c
  *
  * OMAP1 I/O mapping code
  *
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/arch/tc.h>
 
+extern int clk_init(void);
 extern void omap_check_revision(void);
 extern void omap_sram_init(void);
 

diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 73f5d2a5772a426cab86eefe07b908532d79662c..59ec5e157112bdb48ed1a8415c32f9010d8dd1e6 100644 (file)
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/omap1/id.c
+ * linux/arch/arm/mach-omap1/id.c
  *
  * OMAP1 CPU identification code
  *

diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
index 0a4e0fb4e3333873cb715c3ec73e010887cff245..d540539c9bbb7e23fd27e3d4272a481ce21f136a 100644 (file)
--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/omap1/time.c
+ * linux/arch/arm/mach-omap1/time.c
  *
  * OMAP Timers
  *

diff --git a/arch/arm/plat-omap/bootreason.c b/arch/arm/plat-omap/bootreason.c
index 06b9db62f279a934a3db49c702e3ac30731fc228..32d6c9fb534a4ff9088866a22a8484a425322a80 100644 (file)
--- a/arch/arm/plat-omap/bootreason.c
+++ b/arch/arm/plat-omap/bootreason.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/bootreason.c
+ * linux/arch/arm/plat-omap/bootreason.c
  *
  * OMAP Bootreason passing
  *

diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index db4094b7e5115c3d932759dd7575bcbea8441ea1..0904e0458e5609a66eefae2b98825c6f1f748e81 100644 (file)
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/mach-omap/clock.c
+ *  linux/arch/arm/plat-omap/clock.c
  *
  *  Copyright (C) 2004 Nokia corporation
  *  Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>

diff --git a/arch/arm/plat-omap/clock.h b/arch/arm/plat-omap/clock.h
index 7fbd63d75ca8288d76e4390e548c63ee1103953a..a89e1e8c2519116cee18a88a8a7111169290fc2b 100644 (file)
--- a/arch/arm/plat-omap/clock.h
+++ b/arch/arm/plat-omap/clock.h
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/mach-omap/clock.h
+ *  linux/arch/arm/plat-omap/clock.h
  *
  *  Copyright (C) 2004 Nokia corporation
  *  Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>

diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 51139a6f040e4dc6d39f7c609022bfe1727bfb62..62fc86c39b54ed22138d3acb5fa20950d3b1238e 100644 (file)
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/common.c
+ * linux/arch/arm/plat-omap/common.c
  *
  * Code common to all OMAP machines.
  *

diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c
index 9f38bc45a505616dcb1dd22dee6c13736f84c50a..409aac2c4b9de75400cf0f34bc50131362bb7125 100644 (file)
--- a/arch/arm/plat-omap/cpu-omap.c
+++ b/arch/arm/plat-omap/cpu-omap.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/mach-omap/cpu-omap.c
+ *  linux/arch/arm/plat-omap/cpu-omap.c
  *
  *  CPU frequency scaling for OMAP
  *

diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index a663f3b7b2237141d52b9ae5c7558aa2abaa7031..a1468d7326eb5b4485c516b40c29ce428ef36639 100644 (file)
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/dmtimer.c
+ * linux/arch/arm/plat-omap/dmtimer.c
  *
  * OMAP Dual-Mode Timers
  *

diff --git a/arch/arm/plat-omap/gpio-switch.c b/arch/arm/plat-omap/gpio-switch.c
index 1577699f9226687ce8c507b173bba39f4011dcac..196073e81466e076708a6c6553034e23bba81da8 100644 (file)
--- a/arch/arm/plat-omap/gpio-switch.c
+++ b/arch/arm/plat-omap/gpio-switch.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/mach-omap/gpio-switch.c
+ *  linux/arch/arm/plat-omap/gpio-switch.c
  *
  *  Copyright (C) 2004, 2005 Nokia Corporation
  *  Written by Juha Yrjölä <juha.yrjola@nokia.com>

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 5436481b676ba3f8860e227016d61dd896717813..29d23a1139a098b6d1826b4df0b6acfb506644e9 100644 (file)
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/mach-omap/gpio.c
+ *  linux/arch/arm/plat-omap/gpio.c
  *
  * Support functions for OMAP GPIO
  *

diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c
index 65d9b485f4e3be3b72c44548efcc1dc8f164e06b..ea7b955b9c819f05df337590529143ae982cc74b 100644 (file)
--- a/arch/arm/plat-omap/mux.c
+++ b/arch/arm/plat-omap/mux.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/mux.c
+ * linux/arch/arm/plat-omap/mux.c
  *
  * Utility to set the Omap MUX and PULL_DWN registers from a table in mux.h
  *

diff --git a/arch/arm/plat-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c
index c9ced134a75d6934a80a843ee4fd7a1b5b81123f..1fb16f9edfd58ba552ddb0bee7f6487e0fb6d5fd 100644 (file)
--- a/arch/arm/plat-omap/ocpi.c
+++ b/arch/arm/plat-omap/ocpi.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/ocpi.c
+ * linux/arch/arm/plat-omap/ocpi.c
  *
  * Minimal OCP bus support for omap16xx
  *

diff --git a/arch/arm/plat-omap/pm.c b/arch/arm/plat-omap/pm.c
index 61d9ec7f79f356bbb6a5954585999262c303fbfe..dd2dc403d72b1f28b5632d87e6cd9c7934972979 100644 (file)
--- a/arch/arm/plat-omap/pm.c
+++ b/arch/arm/plat-omap/pm.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/pm.c
+ * linux/arch/arm/plat-omap/pm.c
  *
  * OMAP Power Management Routines
  *

diff --git a/arch/arm/plat-omap/sleep.S b/arch/arm/plat-omap/sleep.S
index 602369d4ee49c82290f3d9609d7d1a735abe9bfb..cb584f45954b67eae625598071577fb303dc1a16 100644 (file)
--- a/arch/arm/plat-omap/sleep.S
+++ b/arch/arm/plat-omap/sleep.S
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/sleep.S
+ * linux/arch/arm/plat-omap/sleep.S
  *
  * Low-level OMAP1510/1610 sleep/wakeUp support
  *

diff --git a/arch/arm/plat-omap/sram-fn.S b/arch/arm/plat-omap/sram-fn.S
index bf92d80ca64d890c216e4f71dc725a8de7009f8e..0134187063d66711fc6c3459858720328d15b8c6 100644 (file)
--- a/arch/arm/plat-omap/sram-fn.S
+++ b/arch/arm/plat-omap/sram-fn.S
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/sram.S
+ * linux/arch/arm/plat-omap/sram.S
  *
  * Functions that need to be run in internal SRAM
  *

diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index 3faf9b05c329c10f4354b35863054946f538c17e..a4daf0f193a970efc0db10c7c91d938bd1bde8fc 100644 (file)
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/sram.c
+ * linux/arch/arm/plat-omap/sram.c
  *
  * OMAP SRAM detection and management
  *

diff --git a/arch/arm/plat-omap/sram.h b/arch/arm/plat-omap/sram.h
index 3523da7fa25e3053bff43c675485efb9938753d5..71984efa6ae85b60024ccc2f1652c5fae22dda2e 100644 (file)
--- a/arch/arm/plat-omap/sram.h
+++ b/arch/arm/plat-omap/sram.h
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/sram.h
+ * linux/arch/arm/plat-omap/sram.h
  *
  * Interface for functions that need to be run in internal SRAM
  *

diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c
index fa34896fae0678ca93befe59656689ee1bcaf5e2..98f1c76f86606f039dad4501651f371f7056f099 100644 (file)
--- a/arch/arm/plat-omap/usb.c
+++ b/arch/arm/plat-omap/usb.c
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mach-omap/usb.c -- platform level USB initialization
+ * arch/arm/plat-omap/usb.c -- platform level USB initialization
  *
  * Copyright (C) 2004 Texas Instruments, Inc.
  *