Include mach/generic.h where omap_set_bootmmc_devname is declared.
Change the argument of omap_set_bootmmc_devname to const char *
to fix the resulting conflicting prototypes.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
arch/arm/mach-omap/omap_generic.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap/omap_generic.c b/arch/arm/mach-omap/omap_generic.c
index e7ca821..f024de6 100644
--- a/arch/arm/mach-omap/omap_generic.c
+++ b/arch/arm/mach-omap/omap_generic.c
@@ -20,10 +20,11 @@
#include <fs.h>
#include <malloc.h>
#include <linux/stat.h>
+#include <mach/generic.h>
-static char *omap_bootmmc_dev;
+const static char *omap_bootmmc_dev;
-void omap_set_bootmmc_devname(char *devname)
+void omap_set_bootmmc_devname(const char *devname)
{
omap_bootmmc_dev = devname;
}
@@ -37,7 +38,8 @@ const char *omap_get_bootmmc_devname(void)
static int omap_env_init(void)
{
struct stat s;
- char *diskdev, *partname;
+ char *partname;
+ const char *diskdev;
int ret;
if (bootsource_get() != BOOTSOURCE_MMC)
--
1.8.4.rc3
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
