diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-19 16:30:48 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-19 16:30:48 -0800 |
| commit | 85027a6792767587a8a2bb11d41db415dd5f9d00 (patch) | |
| tree | 64fe0da6d712631dd8f8ae6969605d86734e5585 /arch/arm/boot/dts/Makefile | |
| parent | 606d5313365a2f03af33553abed5637f543f85dd (diff) | |
| parent | 03ed8470575bad95e8360108183cff5ca0c8e44e (diff) | |
| download | op-kernel-dev-85027a6792767587a8a2bb11d41db415dd5f9d00.zip op-kernel-dev-85027a6792767587a8a2bb11d41db415dd5f9d00.tar.gz | |
Merge branch 'asm/dt' into next/dt
* asm/dt:
add Alphascale to vendor-prefixes.txt
ARM: add alphascale,acc.txt bindings documentation
ARM: dts: add DT for Alphascale ASM9260 SoC
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 311691b..f2fd0a2 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -628,7 +628,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt6592-evb.dtb \ mt8127-moose.dtb \ mt8135-evbp1.dtb - +dtb-$(CONFIG_MACH_ASM9260) += alphascale-asm9260-devkit.dtb endif always := $(dtb-y) |
