From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 1/4] ARM: OMAP: Add missing include
Date: Fri, 27 Sep 2013 09:17:49 +0200 [thread overview]
Message-ID: <1380266272-931-2-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1380266272-931-1-git-send-email-s.hauer@pengutronix.de>
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@pengutronix.de>
---
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@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-09-27 7:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-27 7:17 OMAP patches Sascha Hauer
2013-09-27 7:17 ` Sascha Hauer [this message]
2013-09-27 7:17 ` [PATCH 2/4] ARM: OMAP: register OMAP specific barebox bootm handler Sascha Hauer
2013-09-27 8:25 ` Jean-Christophe PLAGNIOL-VILLARD
2013-09-27 8:37 ` Sascha Hauer
2013-09-27 7:17 ` [PATCH 3/4] ARM: OMAP: unconditionally use /boot/barebox.env Sascha Hauer
2013-09-27 7:17 ` [PATCH 4/4] i2c: omap: remove unncessary printf Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1380266272-931-2-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox