[PATCH][MTD] MAPS: ocotea.c compile fix and add Id keyword

Matt Porter
2005-08-16T07:46:27Z

[MTD] MAPS: ocotea.c compile fix and add Id keyword

Signed-off-by: Matt Porter <mporter@kernel.crashing.org>

Index: drivers/mtd/maps/ocotea.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ocotea.c,v
retrieving revision 1.3
diff -u -r1.3 ocotea.c
--- drivers/mtd/maps/ocotea.c 4 Nov 2004 13:24:15 -0000 1.3
+++ drivers/mtd/maps/ocotea.c 16 Aug 2005 07:11:11 -0000
@@ -1,9 +1,10 @@
/*
- * Mapping for Ocotea user flash
+ * $Id: $
*
- * Matt Porter <mporter@kernel.crashing.org>
+ * Mapping for Ocotea user flash
*
* Copyright 2002-2004 MontaVista Software Inc.
+ * Copyright 2005 Matt Porter <mporter@kernel.crashing.org>
*
* 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
@@ -29,13 +30,13 @@
static struct map_info ocotea_small_map = {
.name = "Ocotea small flash",
.size = OCOTEA_SMALL_FLASH_SIZE,
- .buswidth = 1,
+ .bankwidth = 1,
};

static struct map_info ocotea_large_map = {
.name = "Ocotea large flash",
.size = OCOTEA_LARGE_FLASH_SIZE,
- .buswidth = 1,
+ .bankwidth = 1,
};

static struct mtd_partition ocotea_small_partitions[] = {
@@ -67,11 +68,11 @@
u8 *fpga0_adr;
unsigned long long small_flash_base, large_flash_base;

- fpga0_adr = ioremap64(OCOTEA_FPGA_ADDR, 16);
+ fpga0_adr = ioremap64(OCOTEA_FPGA_REG_0, 16);
if (!fpga0_adr)
return -ENOMEM;

- fpga0_reg = readb((unsigned long)fpga0_adr);
+ fpga0_reg = readb(fpga0_adr);
iounmap(fpga0_adr);

if (OCOTEA_BOOT_LARGE_FLASH(fpga0_reg)) {