diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-03-29 00:49:54 -0700 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:54:27 -0700 |
commit | ccf0dec6fcadb4e1c877b9bafb031a6bdb7112b9 (patch) | |
tree | 98617d025f167ad05bb126f0982841ce277ee3af /drivers/mtd/maps | |
parent | 6a23acf3905287eb952a6f1dbbc8fb3e4eeae2f6 (diff) | |
download | kernel_samsung_smdk4412-ccf0dec6fcadb4e1c877b9bafb031a6bdb7112b9.zip kernel_samsung_smdk4412-ccf0dec6fcadb4e1c877b9bafb031a6bdb7112b9.tar.gz kernel_samsung_smdk4412-ccf0dec6fcadb4e1c877b9bafb031a6bdb7112b9.tar.bz2 |
[SPARC/64] constify of_get_property return: drivers
The only unfortunate bit here is that the name field of struct map_info
is not const, so for now we put a cast on the assignment of it.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/mtd/maps')
-rw-r--r-- | drivers/mtd/maps/sun_uflash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c index 4db2055..001af7f 100644 --- a/drivers/mtd/maps/sun_uflash.c +++ b/drivers/mtd/maps/sun_uflash.c @@ -39,7 +39,7 @@ MODULE_VERSION("2.0"); static LIST_HEAD(device_list); struct uflash_dev { - char *name; /* device name */ + const char *name; /* device name */ struct map_info map; /* mtd map info */ struct mtd_info *mtd; /* mtd info */ }; @@ -80,7 +80,7 @@ int uflash_devinit(struct linux_ebus_device *edev, struct device_node *dp) up->name = of_get_property(dp, "model", NULL); if (up->name && 0 < strlen(up->name)) - up->map.name = up->name; + up->map.name = (char *)up->name; up->map.phys = res->start; |