diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-24 18:04:27 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-24 18:04:27 -0400 |
| commit | af1bdb79ca64ceadc7b44b11929b384eff66ce59 (patch) | |
| tree | c4bb4c94acaf44a113edc60dc0661d4282f0f100 /arch/arm/mach-exynos4/Makefile.boot | |
| parent | 552a79413a691a09abf1b3707561858422afc53c (diff) | |
| parent | 1021eb4c454312e65365a4700a1f2b33a0654aa4 (diff) | |
Merge branch 'devicetree/arm-linaro-3.1' of git://git.secretlab.ca/git/linux-2.6 into linaro-3.1linux-linaro-3.1-2011.10-2
Diffstat (limited to 'arch/arm/mach-exynos4/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-exynos4/Makefile.boot | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/Makefile.boot b/arch/arm/mach-exynos4/Makefile.boot index d65956ffb43..fcee6b5384a 100644 --- a/arch/arm/mach-exynos4/Makefile.boot +++ b/arch/arm/mach-exynos4/Makefile.boot @@ -1,2 +1,4 @@ zreladdr-y := 0x40008000 params_phys-y := 0x40000100 + +dtb-$(CONFIG_MACH_SMDKV310) += exynos4-smdkv310.dtb |