On Tue, Sep 11, 2012 at 01:43:27PM +0200, Jan Luebbe wrote:
> Signed-off-by: Jan Luebbe <jlu at pengutronix.de>
> ---
> arch/arm/mach-omap/include/mach/xload.h | 3 ---
> arch/arm/mach-omap/xload.c | 8 ++++----
> 2 files changed, 4 insertions(+), 7 deletions(-)
Applied (both), thanks
Sascha
>
> diff --git a/arch/arm/mach-omap/include/mach/xload.h b/arch/arm/mach-omap/include/mach/xload.h
> index 26f1b68..9294477 100644
> --- a/arch/arm/mach-omap/include/mach/xload.h
> +++ b/arch/arm/mach-omap/include/mach/xload.h
> @@ -1,9 +1,6 @@
> #ifndef _MACH_XLOAD_H
> #define _MACH_XLOAD_H
>
> -void *omap_xload_boot_nand(int offset);
> -void *omap_xload_boot_mmc(void);
> -
> enum omap_boot_src {
> OMAP_BOOTSRC_UNKNOWN,
> OMAP_BOOTSRC_MMC1,
> diff --git a/arch/arm/mach-omap/xload.c b/arch/arm/mach-omap/xload.c
> index 0afeea9..18a90c9 100644
> --- a/arch/arm/mach-omap/xload.c
> +++ b/arch/arm/mach-omap/xload.c
> @@ -9,7 +9,7 @@
> #include <sizes.h>
> #include <filetype.h>
>
> -void *read_image_head(const char *name)
> +static void *read_image_head(const char *name)
> {
> void *header = xmalloc(ARM_HEAD_SIZE);
> struct cdev *cdev;
> @@ -32,7 +32,7 @@ void *read_image_head(const char *name)
> return header;
> }
>
> -unsigned int get_image_size(void *head)
> +static unsigned int get_image_size(void *head)
> {
> unsigned int ret = 0;
> unsigned int *psize = head + ARM_HEAD_SIZE_OFFSET;
> @@ -44,7 +44,7 @@ unsigned int get_image_size(void *head)
> return ret;
> }
>
> -void *omap_xload_boot_nand(int offset)
> +static void *omap_xload_boot_nand(int offset)
> {
> int ret;
> int size;
> @@ -81,7 +81,7 @@ void *omap_xload_boot_nand(int offset)
> return to;
> }
>
> -void *omap_xload_boot_mmc(void)
> +static void *omap_xload_boot_mmc(void)
> {
> int ret;
> void *buf;
> --
> 1.7.10.4
>
>
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |