[include] pass opkg offline root as command line arg, solves caching issues when...

[openwrt.git] / 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 c637c4f..ed407eb 100644 (file)
--- 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
  *
  *  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.
  *
  *  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 <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"
 
 #define DRV_NAME       "adm5120-flash"
 #define DRV_DESC       "ADM5120 flash MAP driver"


@@ -236,7 +233,7 @@ static int adm5120_flash_initinfo(struct adm5120_flash_info *info,
        struct flash_desc *fdesc;
        u32 t = 0;
 
        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");
 
        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_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);
 MODULE_DESCRIPTION(DRV_DESC);