diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:23:11 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:23:11 -0700 |
| commit | 7e95c548818d2b311090848083277fb907cfb56d (patch) | |
| tree | 86fecf07ae1f01ba8bac5969974a7915b738baee /arch/arm/mach-prima2/Makefile.boot | |
| parent | 6d55d5968a8622f3ea20ec40737aea1cfba6438c (diff) | |
| parent | 99261fbad0a16f105b262d7525801697588ba526 (diff) | |
Merge branch 'next/dt' into HEAD
Conflicts:
Documentation/devicetree/bindings/usb/platform-uhci.txt
arch/arm/mach-vt8500/bv07.c
arch/arm/mach-vt8500/devices-vt8500.c
arch/arm/mach-vt8500/devices-wm8505.c
arch/arm/mach-vt8500/devices.c
arch/arm/mach-vt8500/devices.h
arch/arm/mach-vt8500/wm8505_7in.c
Diffstat (limited to 'arch/arm/mach-prima2/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-prima2/Makefile.boot | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-prima2/Makefile.boot b/arch/arm/mach-prima2/Makefile.boot index c77a4883a4e..98167da874c 100644 --- a/arch/arm/mach-prima2/Makefile.boot +++ b/arch/arm/mach-prima2/Makefile.boot @@ -1,3 +1,5 @@ zreladdr-y += 0x00008000 params_phys-y := 0x00000100 initrd_phys-y := 0x00800000 + +dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb |