diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:46:22 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:46:22 -0400 |
commit | 22648cbcf5efd94c2632b3fe8c5c90ae54df928d (patch) | |
tree | 56a49fcd9a974d61f1a4e224f23efe9b4fd1b438 /arch/arm/mach-versatile/Makefile.boot | |
parent | db9431f0e697b132a7b6aca9c946f85851af5a39 (diff) | |
parent | 5049b88232de6414144f4cf0f4510227afd0098e (diff) |
Merge branch 'devicetree/linaro-3.0' of git://git.secretlab.ca/git/linux-2.6 into linaro-3.0
Diffstat (limited to 'arch/arm/mach-versatile/Makefile.boot')
-rw-r--r-- | arch/arm/mach-versatile/Makefile.boot | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-versatile/Makefile.boot b/arch/arm/mach-versatile/Makefile.boot index c7e75acfe6c..e2227d3c23c 100644 --- a/arch/arm/mach-versatile/Makefile.boot +++ b/arch/arm/mach-versatile/Makefile.boot @@ -2,3 +2,5 @@ params_phys-y := 0x00000100 initrd_phys-y := 0x00800000 +dtb-$(CONFIG_ARCH_VERSATILE_PB) += versatile-pb.dtb +dtb-$(CONFIG_MACH_VERSATILE_AB) += versatile-ab.dtb |