On Mon, Jun 25, 2012 at 02:58:11PM +0400, Antony Pavlov wrote:
> Signed-off-by: Antony Pavlov <antonynpavlov@xxxxxxxxx>
Squashed into the original commit causing the warnings.
Thanks
Sascha
> ---
> arch/mips/mach-xburst/reset-jz4750.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/mips/mach-xburst/reset-jz4750.c b/arch/mips/mach-xburst/reset-jz4750.c
> index 4bda56c..765c033 100644
> --- a/arch/mips/mach-xburst/reset-jz4750.c
> +++ b/arch/mips/mach-xburst/reset-jz4750.c
> @@ -29,7 +29,7 @@
>
> #define JZ_EXTAL 24000000
>
> -static void jz4750d_halt(void)
> +static void __noreturn jz4750d_halt(void)
> {
> while (1) {
> __asm__(".set push;\n"
> @@ -65,10 +65,10 @@ void __noreturn poweroff()
> shutdown_barebox();
>
> do {
> - ctrl = readl(RTC_RCR);
> + ctrl = readl((u32 *)RTC_RCR);
> } while (!(ctrl & RTC_RCR_WRDY));
>
> - writel(RTC_HCR_PD, RTC_HCR);
> + writel(RTC_HCR_PD, (u32 *)RTC_HCR);
> jz4750d_halt();
> }
> EXPORT_SYMBOL(poweroff);
> --
> 1.7.10
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> 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 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
