diff options
author | Greg Kroah-Hartman | 2019-06-23 09:21:15 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2019-06-23 09:21:15 +0200 |
commit | 58ee01007c9e00531c1280b2d99b49d29a5e9844 (patch) | |
tree | d1feb7102591a811b4458e2e209d476580ae3687 /arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | |
parent | usb: clean up some of the computations in adu_read (diff) | |
parent | Linux 5.2-rc6 (diff) | |
download | kernel-qcow2-linux-58ee01007c9e00531c1280b2d99b49d29a5e9844.tar.gz kernel-qcow2-linux-58ee01007c9e00531c1280b2d99b49d29a5e9844.tar.xz kernel-qcow2-linux-58ee01007c9e00531c1280b2d99b49d29a5e9844.zip |
Merge 5.2-rc6 into usb-next
We need the USB fixes in here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts')
-rw-r--r-- | arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts index babcfec50dde..7c34360d3285 100644 --- a/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts +++ b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts @@ -18,6 +18,7 @@ }; memory { + device_type = "memory"; reg = <0x00000000 0x08000000>; }; |