Merge branch 'core/locking' into core/urgent

[linux-2.6] / drivers / mtd / maps / autcpu12-nvram.c

diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c
index cf362ccc3c8ed57c029dd8dbd8aaadbb69a5a451..53664188fc471c1ecd03952abc7b044129ea16cb 100644 (file)
--- a/drivers/mtd/maps/autcpu12-nvram.c
+++ b/drivers/mtd/maps/autcpu12-nvram.c
@@ -1,9 +1,7 @@
 /*
- * NV-RAM memory access on autcpu12 
+ * NV-RAM memory access on autcpu12
  * (C) 2002 Thomas Gleixner (gleixner@autronix.de)
  *
- * $Id: autcpu12-nvram.c,v 1.8 2004/11/04 13:24:14 gleixner Exp $ 
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -27,8 +25,8 @@
 #include <linux/init.h>
 #include <asm/io.h>
 #include <asm/sizes.h>
-#include <asm/hardware.h>
-#include <asm/arch/autcpu12.h>
+#include <mach/hardware.h>
+#include <mach/autcpu12.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
@@ -55,10 +53,10 @@ static int __init init_autcpu12_sram (void)
        }
        simple_map_init(&autcpu_sram_map);
 
-       /* 
-        * Check for 32K/128K 
-        * read ofs 0 
-        * read ofs 0x10000 
+       /*
+        * Check for 32K/128K
+        * read ofs 0
+        * read ofs 0x10000
         * Write complement to ofs 0x100000
         * Read and check result on ofs 0x0
         * Restore contents
@@ -66,7 +64,7 @@ static int __init init_autcpu12_sram (void)
        save0 = map_read32(&autcpu12_sram_map,0);
        save1 = map_read32(&autcpu12_sram_map,0x10000);
        map_write32(&autcpu12_sram_map,~save0,0x10000);
-       /* if we find this pattern on 0x0, we have 32K size 
+       /* if we find this pattern on 0x0, we have 32K size
         * restore contents and exit
         */
        if ( map_read32(&autcpu12_sram_map,0) != save0) {
@@ -89,7 +87,7 @@ map:
 
        sram_mtd->owner = THIS_MODULE;
        sram_mtd->erasesize = 16;
-       
+
        if (add_mtd_device(sram_mtd)) {
                printk("NV-RAM device addition failed\n");
                err = -ENOMEM;
@@ -97,7 +95,7 @@ map:
        }
 
        printk("NV-RAM device size %ldKiB registered on AUTCPU12\n",autcpu12_sram_map.size/SZ_1K);
-               
+
        return 0;
 
 out_probe: