diff options
author | Tony Lindgren <tony@atomide.com> | 2013-09-18 12:50:45 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-09-18 12:50:45 -0700 |
commit | 45bea1d39a956619881315e20bdf52c8a702be03 (patch) | |
tree | 80376af9c06b72aef53f44e422ad52bc45f302ee /arch/arm/boot/dts/Makefile | |
parent | 272b98c6455f00884f0350f775c5342358ebb73f (diff) | |
parent | 65399f03266e138506417920952e1c8ed022ec47 (diff) | |
download | linux-45bea1d39a956619881315e20bdf52c8a702be03.tar.bz2 |
Merge tag 'for_3.12-rc2/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.12/fixes-dt
Fix BBB LDO voltage to avoid HDMI destruction
Fix OMAP5 wrong attribute
Fix typo in beagle xM strings
Fix missing pinmux and regulator for OMAP4 wifi
Fix missing pinmux for igep headset
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index cc0f1fb61753..e95af3f5433b 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -183,6 +183,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ am335x-evm.dtb \ am335x-evmsk.dtb \ am335x-bone.dtb \ + am335x-boneblack.dtb \ am3517-evm.dtb \ am3517_mt_ventoux.dtb \ am43x-epos-evm.dtb |