diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-25 12:30:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-27 09:09:58 +0200 |
| commit | 9d88abf95823761315acd05ea7db7a1f309d2519 (patch) | |
| tree | 3f87bd005341999b94fad38745971a1ea2506622 /arch/arm/mach-omap/omap_generic.c | |
| parent | f043520c5abe7627168af77b2c4b2992c4679e3a (diff) | |
| download | barebox-9d88abf95823761315acd05ea7db7a1f309d2519.tar.gz barebox-9d88abf95823761315acd05ea7db7a1f309d2519.tar.xz | |
ARM: OMAP: Add missing include
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>
Diffstat (limited to 'arch/arm/mach-omap/omap_generic.c')
| -rw-r--r-- | arch/arm/mach-omap/omap_generic.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-omap/omap_generic.c b/arch/arm/mach-omap/omap_generic.c index e7ca821212..f024de69c5 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) |