[ARM] Convert asm/io.h to linux/io.h

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / clock.c

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 5d9faa68d2ecdb7eb5c32b1915ec4b02120a374e..478c2c9a22cb02cfda5bb3472f6b911f0790483b 100644 (file)
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -1,4 +1,3 @@
-//kernel/linux-omap-fsample/arch/arm/mach-omap1/clock.c#2 - edit change 3808 (text)
 /*
  *  linux/arch/arm/mach-omap1/clock.c
  *
@@ -18,14 +17,14 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/clk.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/cpu.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sram.h>
+#include <mach/cpu.h>
+#include <mach/usb.h>
+#include <mach/clock.h>
+#include <mach/sram.h>
 
 #include "clock.h"
 
@@ -650,9 +649,9 @@ static void __init omap1_clk_disable_unused(struct clk *clk)
 
        /* FIXME: This clock seems to be necessary but no-one
         * has asked for its activation. */
-       if (clk == &tc2_ck              // FIX: pm.c (SRAM), CCP, Camera
-           || clk == &ck_dpll1out.clk  // FIX: SoSSI, SSR
-           || clk == &arm_gpio_ck      // FIX: GPIO code for 1510
+       if (clk == &tc2_ck              /* FIX: pm.c (SRAM), CCP, Camera */
+           || clk == &ck_dpll1out.clk  /* FIX: SoSSI, SSR */
+           || clk == &arm_gpio_ck      /* FIX: GPIO code for 1510 */
                ) {
                printk(KERN_INFO "FIXME: Clock \"%s\" seems unused\n",
                       clk->name);