[PATCH arm-soc.git/for-next] ARM: l2x0: Fix merge typo with "ARM: l2x0: add empty l2x0_of_init"

[Arnd Bergmann]

On Friday 21 October 2011, Jarkko Nikula wrote:
> Fix build error "error: implicit declaration of function 'l2x0_init'" if
> CONFIG_OF is not set. This looks like to be caused by some manual typo when
> committing or merging as this is not in the original patch.
> 
> Signed-off-by: Jarkko Nikula <jarkko.nikula at bitmer.com>
> Cc: Rob Herring <rob.herring at calxeda.com>


Hi Jarkko,

The bug was introduce by a broken rebase on my side. I've redone this now and hope
I got it right this time.

Thanks for the report!

	Arnd