[PATCH 4/4] ARM: ux500: Remove call to u8500_of_init_devices() - again

Linus Walleij linus.walleij at linaro.org
Fri Jun 7 03:47:06 EDT 2013

On Thu, Jun 6, 2013 at 1:21 PM, Lee Jones <lee.jones at linaro.org> wrote:

> Somehow, probably due to a merge error the call to u8500_of_init_devices()
> has re-appeared in next, causing this error:
> arch/arm/mach-ux500/cpu-db8500.c: In function ‘u8500_init_machine’:
> arch/arm/mach-ux500/cpu-db8500.c:268:2: error: implicit declaration of     \
>   function ‘u8500_of_init_devices’ [-Werror=implicit-function-declaration]
> arch/arm/mach-ux500/cpu-db8500.c:268:9: warning: assignment makes pointer  \
>   from integer without a cast [enabled by default]
> Signed-off-by: Lee Jones <lee.jones at linaro.org>

Looking closer this seems like it's fixing a merge error that appeared in
my linux-stericsson mixdown branch "next" at one point, and which was
fixed three days ago.

The ARM SoC maintainers may need to watch out for that merge error
when pullin in my 5 pull requests sent recently though, that is
essentially the basic merge conflict between the DMA40 and
general devicetree work.

Linus Walleij

More information about the linux-arm-kernel mailing list