Commit 4de12360 authored Jun 21, 2013 by Arnd Bergmann

Merge tag 'regmap-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/soc

From Jason Cooper:

mvebu register map changes for v3.11 (round 2)

This series removes the hardcoded register base address for mvebu.

For round 2:
 - multiplatform
    - fix booting on anything other than mvebu

Depends (none new for round 2):
 - mvebu/fixes-non-critical (up to tags/fixes-non-3.11-1)
 - mvebu/cleanup (up to tags/cleanup-3.11-3)

* tag 'regmap-3.11-2' of git://git.infradead.org/users/jcooper/linux

:
  arm: mvebu: fix coherency_late_init() for multiplatform

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 30e54461 1919bff0

arch/arm/mach-mvebu/coherency.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -147,6 +147,7 @@ int __init coherency_init(void)

		static int __init coherency_late_init(void)
		{
		if (of_find_matching_node(NULL, of_coherency_table))
		bus_register_notifier(&platform_bus_type,
		&mvebu_hwcc_platform_nb);
		return 0;

Admin message