[package] libpcap: explicitely disable libnl support to prevent different build resul...

[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 8bd7ae1..af292a0 100644 (file)
--- a/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c
+++ b/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c
@@ -45,7 +45,7 @@
 
 struct adm5120_map_info {
        struct map_info map;
 
 struct adm5120_map_info {
        struct map_info map;

-       void            (*switch_bank)(unsigned);
+       void            (*switch_bank)(unsigned);

        unsigned long   window_size;
 };
 
        unsigned long   window_size;
 };
 


@@ -89,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",
        "cfi_probe",
        "jedec_probe",
        "map_rom",


@@ -97,7 +97,7 @@ static const char *probe_types[] = {
 };
 
 #ifdef CONFIG_MTD_PARTITIONS
 };
 
 #ifdef CONFIG_MTD_PARTITIONS

-static const char *parse_types[] = {
+static const char const *parse_types[] = {

        "cmdlinepart",
 #ifdef CONFIG_MTD_REDBOOT_PARTS
        "RedBoot",
        "cmdlinepart",
 #ifdef CONFIG_MTD_REDBOOT_PARTS
        "RedBoot",


@@ -233,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");