Merge branch 'mvebu/soc' into next/soc

Browse source

Merge dependency for mvebu-soc-3xx branch from cleanups.

* mvebu/soc:
  ARM: mvebu: remove unneeded ->map_io field for Armada 370/XP
  ARM: mvebu: make use of of_find_matching_node_and_match
  ARM: mvebu: Makefile clean-up

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

...

This commit is contained in:

Arnd Bergmann 2014-02-25 18:33:37 +01:00

parent 3bff547403 08bb3adfd3

commit 4a70931bd1

3 changed files with 5 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

arch/arm/mach-mvebu/Makefile

View file

6

arch/arm/mach-mvebu/armada-370-xp.c

View file

9

arch/arm/mach-mvebu/system-controller.c

View file