diff options
| author | Greg Kroah-Hartman | 2015-10-12 19:49:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-12 19:49:33 +0200 |
| commit | b1630da0589dbf520e4cf565eda6a74c5a813962 (patch) | |
| tree | 290df4d4e49d96ed4df1dfa68ead45991e85cd2e /arch/arm/boot/dts/Makefile | |
| parent | USB: u132-hcd: Fix seperate word in printk message (diff) | |
| parent | Linux 4.3-rc5 (diff) | |
| download | kernel-qcow2-linux-b1630da0589dbf520e4cf565eda6a74c5a813962.tar.gz kernel-qcow2-linux-b1630da0589dbf520e4cf565eda6a74c5a813962.tar.xz kernel-qcow2-linux-b1630da0589dbf520e4cf565eda6a74c5a813962.zip | |
Merge 4.3-rc5 into usb-next
We want the USB fixes in here as well to make merges easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 233159d2eaab..bb8fa023d574 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -578,7 +578,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \ sun4i-a10-hackberry.dtb \ sun4i-a10-hyundai-a7hd.dtb \ sun4i-a10-inet97fv2.dtb \ - sun4i-a10-itead-iteaduino-plus.dts \ + sun4i-a10-itead-iteaduino-plus.dtb \ sun4i-a10-jesurun-q5.dtb \ sun4i-a10-marsboard.dtb \ sun4i-a10-mini-xplus.dtb \ |