summaryrefslogtreecommitdiffstats
path: root/arch/xtensa/include/asm/resource.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-02-24 12:39:18 +0000
committerArnd Bergmann <arnd@arndb.de>2012-02-24 12:39:18 +0000
commitfdc24d4ba20499febb90ff17d3b75674026712f8 (patch)
tree83cebb162add24be7b395090b4daca4bd752641b /arch/xtensa/include/asm/resource.h
parenta5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff)
parent059289b260826deb43601644a7ad39c2608e6861 (diff)
downloadblackbird-op-linux-fdc24d4ba20499febb90ff17d3b75674026712f8.tar.gz
blackbird-op-linux-fdc24d4ba20499febb90ff17d3b75674026712f8.zip
Merge branch 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux into next/dt
* 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux: (573 commits) ARM: vexpress: Add Device Tree for V2P-CA15 core tile (TC1 variant) ARM: vexpress: Add Device Tree for V2P-CA9 core tile ARM: vexpress: Add Device Tree for V2P-CA5s core tile ARM: vexpress: Motherboard RS1 memory map support ARM: vexpress: Add Device Tree support ARM: vexpress: Use FDT data in platform SMP calls ARM: versatile: Map local timers using Device Tree when possible ARM: vexpress: Get rid of MMIO_P2V This adds full device tree boot support for the versatile express platform, as has been awaited for a long time. Conflicts: arch/arm/mach-vexpress/core.h The definition of AMBA_DEVICE was removed in one branch, and the definition of MMIO_P2V was removed in the other branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/xtensa/include/asm/resource.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud