X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/6d8520bc411b3836bbe557de4bf7ce6aaa4c5842..27e94101def26f60ce5f65835c082f791f6ed641:/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c

diff --git a/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c b/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c
index c637c4ff0..af292a06c 100644
--- a/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c
+++ b/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c
@@ -1,10 +1,7 @@
 /*
- *  $Id$
- *
  *  Platform driver for NOR flash devices on ADM5120 based boards
  *
- *  Copyright (C) 2007 OpenWrt.org
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
  *
  *  This file was derived from: drivers/mtd/map/physmap.c
  *	Copyright (C) 2003 MontaVista Software Inc.
@@ -29,10 +26,10 @@
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 
-#include <adm5120_defs.h>
-#include <adm5120_switch.h>
-#include <adm5120_mpmc.h>
-#include <adm5120_platform.h>
+#include <asm/mach-adm5120/adm5120_defs.h>
+#include <asm/mach-adm5120/adm5120_switch.h>
+#include <asm/mach-adm5120/adm5120_mpmc.h>
+#include <asm/mach-adm5120/adm5120_platform.h>
 
 #define DRV_NAME	"adm5120-flash"
 #define DRV_DESC	"ADM5120 flash MAP driver"
@@ -48,7 +45,7 @@
 
 struct adm5120_map_info {
 	struct map_info	map;
-	void 		(*switch_bank)(unsigned);
+	void		(*switch_bank)(unsigned);
 	unsigned long	window_size;
 };
 
@@ -92,7 +89,7 @@ static struct flash_desc flash_descs[2] = {
 	}
 };
 
-static const char *probe_types[] = {
+static const char const *probe_types[] = {
 	"cfi_probe",
 	"jedec_probe",
 	"map_rom",
@@ -100,7 +97,7 @@ static const char *probe_types[] = {
 };
 
 #ifdef CONFIG_MTD_PARTITIONS
-static const char *parse_types[] = {
+static const char const *parse_types[] = {
 	"cmdlinepart",
 #ifdef CONFIG_MTD_REDBOOT_PARTS
 	"RedBoot",
@@ -236,7 +233,7 @@ static int adm5120_flash_initinfo(struct adm5120_flash_info *info,
 	struct flash_desc *fdesc;
 	u32 t = 0;
 
-	map->name = dev->dev.bus_id;
+	map->name = dev_name(&dev->dev);
 
 	if (dev->id > 1) {
 		MAP_ERR(map, "invalid flash id\n");
@@ -567,5 +564,5 @@ module_init(adm5120_flash_init);
 module_exit(adm5120_flash_exit);
 
 MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
 MODULE_DESCRIPTION(DRV_DESC);